Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016

2026-03-24 02:01:06 +00:00 · 2016-01-30 16:40:25 -05:00 · 2016-01-30 16:40:25 -05:00 · 6ac3b0a2f1
commit 6ac3b0a2f1
parent 7daedf9b55 a44a6d11dd
141 changed files with 11294 additions and 314 deletions
--- a/Assets/prefabs/characters.meta
+++ b/Assets/prefabs/characters.meta
--- a/Assets/prefabs/characters/BlackBeard.prefab
+++ b/Assets/prefabs/characters/BlackBeard.prefab
--- a/Assets/prefabs/characters/BlackBeard.prefab.meta
+++ b/Assets/prefabs/characters/BlackBeard.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a764c76ab0e67034e831bc131a6fc125
+timeCreated: 1454186307
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/characters/RedBeard.prefab
+++ b/Assets/prefabs/characters/RedBeard.prefab
--- a/Assets/prefabs/characters/RedBeard.prefab.meta
+++ b/Assets/prefabs/characters/RedBeard.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b6a6c576699a8f489424368f8de6276
+timeCreated: 1454186300
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/prefabs/characters/Source.meta
+++ b/Assets/prefabs/characters/Source.meta
--- a/Assets/prefabs/characters/Source/Animator_controllers.meta
+++ b/Assets/prefabs/characters/Source/Animator_controllers.meta
--- a/Assets/prefabs/characters/Source/Animator_controllers/Unity_Free_anims.controller
+++ b/Assets/prefabs/characters/Source/Animator_controllers/Unity_Free_anims.controller
--- a/Assets/prefabs/characters/Source/Animator_controllers/Unity_Free_anims.controller.meta
+++ b/Assets/prefabs/characters/Source/Animator_controllers/Unity_Free_anims.controller.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_2.mat
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_2.mat
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_2.mat.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_2.mat.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_3.mat
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_3.mat
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_3.mat.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_3.mat.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_4.mat
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_4.mat
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_4.mat.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Character_4.mat.meta
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Expressions_Mat.mat
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Expressions_Mat.mat
--- a/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Expressions_Mat.mat.meta
+++ b/Assets/prefabs/characters/Source/Custom_Materials/Color_Diffuse/Expressions_Mat.mat.meta
--- a/Assets/prefabs/characters/Source/FBX_models.meta
+++ b/Assets/prefabs/characters/Source/FBX_models.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Char_2.fbx
+++ b/Assets/prefabs/characters/Source/FBX_models/Char_2.fbx
--- a/Assets/prefabs/characters/Source/FBX_models/Char_2.fbx.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Char_2.fbx.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_a_open.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_a_open.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_a_open.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_a_open.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_b_mad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_b_mad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_b_mad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_b_mad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_c_sad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_c_sad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_c_sad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_c_sad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_d_midClosed.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_d_midClosed.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_d_midClosed.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_d_midClosed.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_e_Closed.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_e_Closed.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_e_Closed.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_e_Closed.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_f_Closed_happy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_f_Closed_happy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_f_Closed_happy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_f_Closed_happy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_g_Closed_shy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_g_Closed_shy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_g_Closed_shy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_g_Closed_shy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_h_Closed_mad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_h_Closed_mad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_h_Closed_mad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/L_eye_h_Closed_mad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials/defaultMat.mat
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials/defaultMat.mat
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials/defaultMat.mat.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Materials/defaultMat.mat.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_a_Happy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_a_Happy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_a_Happy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_a_Happy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_b_Terrified.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_b_Terrified.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_b_Terrified.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_b_Terrified.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_c_surprised.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_c_surprised.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_c_surprised.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_c_surprised.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_cute.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_cute.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_cute.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_cute.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_d_surprised2.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_d_surprised2.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_d_surprised2.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_d_surprised2.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_e_shut.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_e_shut.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_e_shut.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_e_shut.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_f_sad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_f_sad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_f_sad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_f_sad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_g_happy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_g_happy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_g_happy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/Mouth_g_happy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_a_open.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_a_open.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_a_open.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_a_open.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_b_mad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_b_mad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_b_mad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_b_mad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_c_sad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_c_sad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_c_sad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_c_sad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_d_midClosed.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_d_midClosed.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_d_midClosed.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_d_midClosed.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_e_Closed.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_e_Closed.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_e_Closed.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_e_Closed.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_f_Closed_happy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_f_Closed_happy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_f_Closed_happy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_f_Closed_happy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_g_Closed_shy.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_g_Closed_shy.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_g_Closed_shy.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_g_Closed_shy.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_h_Closed_mad.obj
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_h_Closed_mad.obj
--- a/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_h_Closed_mad.obj.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Expressions_Mesh/R_eye_h_Closed_mad.obj.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Materials.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Materials.meta
--- a/Assets/prefabs/characters/Source/FBX_models/Materials/Color_toon_2.mat
+++ b/Assets/prefabs/characters/Source/FBX_models/Materials/Color_toon_2.mat
--- a/Assets/prefabs/characters/Source/FBX_models/Materials/Color_toon_2.mat.meta
+++ b/Assets/prefabs/characters/Source/FBX_models/Materials/Color_toon_2.mat.meta
--- a/Assets/prefabs/characters/Source/Scripts.meta
+++ b/Assets/prefabs/characters/Source/Scripts.meta
--- a/Assets/prefabs/characters/Source/Scripts/Character_Animations.js
+++ b/Assets/prefabs/characters/Source/Scripts/Character_Animations.js
--- a/Assets/prefabs/characters/Source/Scripts/Character_Animations.js.meta
+++ b/Assets/prefabs/characters/Source/Scripts/Character_Animations.js.meta
--- a/Assets/prefabs/characters/Source/Textures.meta
+++ b/Assets/prefabs/characters/Source/Textures.meta
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps.meta
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps.meta
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_2.psd
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_2.psd
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_2.psd.meta
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_2.psd.meta
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_3.psd
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_3.psd
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_3.psd.meta
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_3.psd.meta
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_4.psd
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_4.psd
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_4.psd.meta
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Color_toon_4.psd.meta
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Expressions.png
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Expressions.png
--- a/Assets/prefabs/characters/Source/Textures/Color_Maps/Expressions.png.meta
+++ b/Assets/prefabs/characters/Source/Textures/Color_Maps/Expressions.png.meta
--- a/Assets/prefabs/characters/Source/Textures/UV_Maps.meta
+++ b/Assets/prefabs/characters/Source/Textures/UV_Maps.meta
--- a/Assets/prefabs/characters/Source/Textures/UV_Maps/UVToon_2.png
+++ b/Assets/prefabs/characters/Source/Textures/UV_Maps/UVToon_2.png
--- a/Assets/prefabs/characters/Source/Textures/UV_Maps/UVToon_2.png.meta
+++ b/Assets/prefabs/characters/Source/Textures/UV_Maps/UVToon_2.png.meta
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations.meta
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations.meta
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@Idle_Neutral.fbx
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@Idle_Neutral.fbx
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@Idle_Neutral.fbx.meta
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@Idle_Neutral.fbx.meta
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlMedium.fbx
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlMedium.fbx
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlMedium.fbx.meta
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlMedium.fbx.meta
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlWide.fbx
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlWide.fbx
--- a/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlWide.fbx.meta
+++ b/Assets/prefabs/characters/Source/Unity_Free_Animations/DefaultAvatar@RunForwardTurnRight_NtrlWide.fbx.meta
--- a/Show More
+++ b/Show More