Merge branch 'dev'

whiteflare · Apr 27, 2019 · d395585 · d395585
2 parents d57a783 + ba6d58c
commit d395585
Show file tree

Hide file tree

Showing 192 changed files with 29,408 additions and 56 deletions.
diff --git a/Examples/README.txt b/Examples/README.txt
@@ -1,5 +1,5 @@
 ================================================================
-ShaderTest
+Examples
 ================================================================
 
 このフォルダには Unlit_WF_ShaderSuite のテストのための scene が入っています。

diff --git a/Examples/UnToon_Avatar_2A-7s.unity b/Examples/UnToon_Avatar_2A-7s.unity
diff --git a/Examples/UnToon_Avatar_2A-7s.unity.meta b/Examples/UnToon_Avatar_2A-7s.unity.meta
diff --git a/Examples/UnToon_Sample.unity b/Examples/UnToon_Sample.unity
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2eroVRC.prefab b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2eroVRC.prefab
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2ero_Avatar.prefab b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2ero_Avatar.prefab
diff --git a/...ets/2a7s_2eroVRC/2a7s_2eroVRC.prefab.meta → ...2a7s_2eroVRC/2a7s_2ero_Avatar.prefab.meta b/...ets/2a7s_2eroVRC/2a7s_2eroVRC.prefab.meta → ...2a7s_2eroVRC/2a7s_2ero_Avatar.prefab.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim.meta