Imported Ellen character

dbrizov · Dec 31, 2018 · e876ecc · e876ecc
1 parent ce78ac5
commit e876ecc
Show file tree

Hide file tree

Showing 355 changed files with 33,441 additions and 1,280 deletions.
diff --git a/Assets/TP Controller.meta → Assets/NaughtyController.meta b/Assets/TP Controller.meta → Assets/NaughtyController.meta
diff --git a/Assets/TP Controller/Characters.meta → Assets/NaughtyController/Characters.meta b/Assets/TP Controller/Characters.meta → Assets/NaughtyController/Characters.meta
diff --git a/Assets/TP Controller/Characters/Beta.meta → ...ts/NaughtyController/Characters/Beta.meta b/Assets/TP Controller/Characters/Beta.meta → ...ts/NaughtyController/Characters/Beta.meta
diff --git a/Assets/TP Controller/Animations.meta → ...ontroller/Characters/Beta/Animations.meta b/Assets/TP Controller/Animations.meta → ...ontroller/Characters/Beta/Animations.meta
diff --git a/...ller/Animations/Beta@crouched_walking.fbx → ...Beta/Animations/Beta@crouched_walking.fbx b/...ller/Animations/Beta@crouched_walking.fbx → ...Beta/Animations/Beta@crouched_walking.fbx
diff --git a/...Animations/Beta@crouched_walking.fbx.meta → ...Animations/Beta@crouched_walking.fbx.meta b/...Animations/Beta@crouched_walking.fbx.meta → ...Animations/Beta@crouched_walking.fbx.meta
diff --git a/...P Controller/Animations/Beta@fast_run.fbx → ...racters/Beta/Animations/Beta@fast_run.fbx b/...P Controller/Animations/Beta@fast_run.fbx → ...racters/Beta/Animations/Beta@fast_run.fbx
diff --git a/...troller/Animations/Beta@fast_run.fbx.meta → ...rs/Beta/Animations/Beta@fast_run.fbx.meta b/...troller/Animations/Beta@fast_run.fbx.meta → ...rs/Beta/Animations/Beta@fast_run.fbx.meta
diff --git a/...ts/TP Controller/Animations/Beta@idle.fbx → .../Characters/Beta/Animations/Beta@idle.fbx b/...ts/TP Controller/Animations/Beta@idle.fbx → .../Characters/Beta/Animations/Beta@idle.fbx
diff --git a/... Controller/Animations/Beta@idle.fbx.meta → ...acters/Beta/Animations/Beta@idle.fbx.meta b/... Controller/Animations/Beta@idle.fbx.meta → ...acters/Beta/Animations/Beta@idle.fbx.meta
diff --git a/...troller/Animations/Beta@idle_rejected.fbx → ...rs/Beta/Animations/Beta@idle_rejected.fbx b/...troller/Animations/Beta@idle_rejected.fbx → ...rs/Beta/Animations/Beta@idle_rejected.fbx
diff --git a/...er/Animations/Beta@idle_rejected.fbx.meta → ...ta/Animations/Beta@idle_rejected.fbx.meta b/...er/Animations/Beta@idle_rejected.fbx.meta → ...ta/Animations/Beta@idle_rejected.fbx.meta
diff --git a/...troller/Animations/Beta@idle_thinking.fbx → ...rs/Beta/Animations/Beta@idle_thinking.fbx b/...troller/Animations/Beta@idle_thinking.fbx → ...rs/Beta/Animations/Beta@idle_thinking.fbx
diff --git a/...er/Animations/Beta@idle_thinking.fbx.meta → ...ta/Animations/Beta@idle_thinking.fbx.meta b/...er/Animations/Beta@idle_thinking.fbx.meta → ...ta/Animations/Beta@idle_thinking.fbx.meta
diff --git a/...ontroller/Animations/Beta@left_strafe.fbx → ...ters/Beta/Animations/Beta@left_strafe.fbx b/...ontroller/Animations/Beta@left_strafe.fbx → ...ters/Beta/Animations/Beta@left_strafe.fbx
diff --git a/...ller/Animations/Beta@left_strafe.fbx.meta → ...Beta/Animations/Beta@left_strafe.fbx.meta b/...ller/Animations/Beta@left_strafe.fbx.meta → ...Beta/Animations/Beta@left_strafe.fbx.meta
diff --git a/...ller/Animations/Beta@left_strafe_walk.fbx → ...Beta/Animations/Beta@left_strafe_walk.fbx b/...ller/Animations/Beta@left_strafe_walk.fbx → ...Beta/Animations/Beta@left_strafe_walk.fbx
diff --git a/...Animations/Beta@left_strafe_walk.fbx.meta → ...Animations/Beta@left_strafe_walk.fbx.meta b/...Animations/Beta@left_strafe_walk.fbx.meta → ...Animations/Beta@left_strafe_walk.fbx.meta
diff --git a/... Controller/Animations/Beta@left_turn.fbx → ...acters/Beta/Animations/Beta@left_turn.fbx b/... Controller/Animations/Beta@left_turn.fbx → ...acters/Beta/Animations/Beta@left_turn.fbx
diff --git a/...roller/Animations/Beta@left_turn.fbx.meta → ...s/Beta/Animations/Beta@left_turn.fbx.meta b/...roller/Animations/Beta@left_turn.fbx.meta → ...s/Beta/Animations/Beta@left_turn.fbx.meta
diff --git a/...ts/TP Controller/Animations/Beta@push.fbx → .../Characters/Beta/Animations/Beta@push.fbx b/...ts/TP Controller/Animations/Beta@push.fbx → .../Characters/Beta/Animations/Beta@push.fbx
diff --git a/... Controller/Animations/Beta@push.fbx.meta → ...acters/Beta/Animations/Beta@push.fbx.meta b/... Controller/Animations/Beta@push.fbx.meta → ...acters/Beta/Animations/Beta@push.fbx.meta
diff --git a/...ntroller/Animations/Beta@right_strafe.fbx → ...ers/Beta/Animations/Beta@right_strafe.fbx b/...ntroller/Animations/Beta@right_strafe.fbx → ...ers/Beta/Animations/Beta@right_strafe.fbx
diff --git a/...ler/Animations/Beta@right_strafe.fbx.meta → ...eta/Animations/Beta@right_strafe.fbx.meta b/...ler/Animations/Beta@right_strafe.fbx.meta → ...eta/Animations/Beta@right_strafe.fbx.meta
diff --git a/...ler/Animations/Beta@right_strafe_walk.fbx → ...eta/Animations/Beta@right_strafe_walk.fbx b/...ler/Animations/Beta@right_strafe_walk.fbx → ...eta/Animations/Beta@right_strafe_walk.fbx
diff --git a/...nimations/Beta@right_strafe_walk.fbx.meta → ...nimations/Beta@right_strafe_walk.fbx.meta b/...nimations/Beta@right_strafe_walk.fbx.meta → ...nimations/Beta@right_strafe_walk.fbx.meta
diff --git a/...Controller/Animations/Beta@right_turn.fbx → ...cters/Beta/Animations/Beta@right_turn.fbx b/...Controller/Animations/Beta@right_turn.fbx → ...cters/Beta/Animations/Beta@right_turn.fbx
diff --git a/...oller/Animations/Beta@right_turn.fbx.meta → .../Beta/Animations/Beta@right_turn.fbx.meta b/...oller/Animations/Beta@right_turn.fbx.meta → .../Beta/Animations/Beta@right_turn.fbx.meta
diff --git a/...TP Controller/Animations/Beta@running.fbx → ...aracters/Beta/Animations/Beta@running.fbx b/...TP Controller/Animations/Beta@running.fbx → ...aracters/Beta/Animations/Beta@running.fbx
diff --git a/...ntroller/Animations/Beta@running.fbx.meta → ...ers/Beta/Animations/Beta@running.fbx.meta b/...ntroller/Animations/Beta@running.fbx.meta → ...ers/Beta/Animations/Beta@running.fbx.meta
diff --git a/...ntroller/Animations/Beta@running_jump.fbx → ...ers/Beta/Animations/Beta@running_jump.fbx b/...ntroller/Animations/Beta@running_jump.fbx → ...ers/Beta/Animations/Beta@running_jump.fbx
diff --git a/...ler/Animations/Beta@running_jump.fbx.meta → ...eta/Animations/Beta@running_jump.fbx.meta b/...ler/Animations/Beta@running_jump.fbx.meta → ...eta/Animations/Beta@running_jump.fbx.meta
diff --git a/...Controller/Animations/Beta@sneak_walk.fbx → ...cters/Beta/Animations/Beta@sneak_walk.fbx b/...Controller/Animations/Beta@sneak_walk.fbx → ...cters/Beta/Animations/Beta@sneak_walk.fbx
diff --git a/...oller/Animations/Beta@sneak_walk.fbx.meta → .../Beta/Animations/Beta@sneak_walk.fbx.meta b/...oller/Animations/Beta@sneak_walk.fbx.meta → .../Beta/Animations/Beta@sneak_walk.fbx.meta
diff --git a/...troller/Animations/Beta@standing_jump.fbx → ...rs/Beta/Animations/Beta@standing_jump.fbx b/...troller/Animations/Beta@standing_jump.fbx → ...rs/Beta/Animations/Beta@standing_jump.fbx
diff --git a/...er/Animations/Beta@standing_jump.fbx.meta → ...ta/Animations/Beta@standing_jump.fbx.meta b/...er/Animations/Beta@standing_jump.fbx.meta → ...ta/Animations/Beta@standing_jump.fbx.meta
diff --git a/...roller/Animations/Beta@standing_jump2.fbx → ...s/Beta/Animations/Beta@standing_jump2.fbx b/...roller/Animations/Beta@standing_jump2.fbx → ...s/Beta/Animations/Beta@standing_jump2.fbx
diff --git a/...r/Animations/Beta@standing_jump2.fbx.meta → ...a/Animations/Beta@standing_jump2.fbx.meta b/...r/Animations/Beta@standing_jump2.fbx.meta → ...a/Animations/Beta@standing_jump2.fbx.meta
diff --git a/...TP Controller/Animations/Beta@walking.fbx → ...aracters/Beta/Animations/Beta@walking.fbx b/...TP Controller/Animations/Beta@walking.fbx → ...aracters/Beta/Animations/Beta@walking.fbx
diff --git a/...ntroller/Animations/Beta@walking.fbx.meta → ...ers/Beta/Animations/Beta@walking.fbx.meta b/...ntroller/Animations/Beta@walking.fbx.meta → ...ers/Beta/Animations/Beta@walking.fbx.meta
diff --git a/...s/TP Controller/Animations/Materials.meta → ...Characters/Beta/Animations/Materials.meta b/...s/TP Controller/Animations/Materials.meta → ...Characters/Beta/Animations/Materials.meta
diff --git a/Assets/NaughtyController/Characters/Beta/Animations/Materials/Beta_Body_MAT.mat b/Assets/NaughtyController/Characters/Beta/Animations/Materials/Beta_Body_MAT.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Beta_Body_MAT
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EmissionScaleUI: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.40899998, g: 0.8263444, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
diff --git a/...imations/Materials/Beta_Body_MAT.mat.meta → ...imations/Materials/Beta_Body_MAT.mat.meta b/...imations/Materials/Beta_Body_MAT.mat.meta → ...imations/Materials/Beta_Body_MAT.mat.meta
diff --git a/Assets/NaughtyController/Characters/Beta/Animations/Materials/Beta_Joints_MAT.mat b/Assets/NaughtyController/Characters/Beta/Animations/Materials/Beta_Joints_MAT.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Beta_Joints_MAT
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EmissionScaleUI: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.05786, g: 0.05786, b: 0.05786, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
diff --git a/...ations/Materials/Beta_Joints_MAT.mat.meta → ...ations/Materials/Beta_Joints_MAT.mat.meta b/...ations/Materials/Beta_Joints_MAT.mat.meta → ...ations/Materials/Beta_Joints_MAT.mat.meta
diff --git a/.../Beta/Beta Animator Controller.controller → .../Beta/Beta Animator Controller.controller b/.../Beta/Beta Animator Controller.controller → .../Beta/Beta Animator Controller.controller
diff --git a/.../Beta Animator Controller.controller.meta → .../Beta Animator Controller.controller.meta b/.../Beta Animator Controller.controller.meta → .../Beta Animator Controller.controller.meta
diff --git a/...ts/TP Controller/Characters/Beta/Beta.fbx → ...aughtyController/Characters/Beta/Beta.fbx b/...ts/TP Controller/Characters/Beta/Beta.fbx → ...aughtyController/Characters/Beta/Beta.fbx
diff --git a/... Controller/Characters/Beta/Beta.fbx.meta → ...yController/Characters/Beta/Beta.fbx.meta b/... Controller/Characters/Beta/Beta.fbx.meta → ...yController/Characters/Beta/Beta.fbx.meta
diff --git a/...Controller/Characters/Beta/Materials.meta → ...Controller/Characters/Beta/Materials.meta b/...Controller/Characters/Beta/Materials.meta → ...Controller/Characters/Beta/Materials.meta
diff --git a/...er/Animations/Materials/Beta_Body_MAT.mat → ...aracters/Beta/Materials/Beta_Body_MAT.mat b/...er/Animations/Materials/Beta_Body_MAT.mat → ...aracters/Beta/Materials/Beta_Body_MAT.mat
diff --git a/...ers/Beta/Materials/Beta_Body_MAT.mat.meta → ...ers/Beta/Materials/Beta_Body_MAT.mat.meta b/...ers/Beta/Materials/Beta_Body_MAT.mat.meta → ...ers/Beta/Materials/Beta_Body_MAT.mat.meta
diff --git a/.../Animations/Materials/Beta_Joints_MAT.mat → ...acters/Beta/Materials/Beta_Joints_MAT.mat b/.../Animations/Materials/Beta_Joints_MAT.mat → ...acters/Beta/Materials/Beta_Joints_MAT.mat
diff --git a/...s/Beta/Materials/Beta_Joints_MAT.mat.meta → ...s/Beta/Materials/Beta_Joints_MAT.mat.meta b/...s/Beta/Materials/Beta_Joints_MAT.mat.meta → ...s/Beta/Materials/Beta_Joints_MAT.mat.meta
diff --git a/Assets/NaughtyController/Characters/Ellen.meta b/Assets/NaughtyController/Characters/Ellen.meta
diff --git a/Assets/NaughtyController/Characters/Ellen/AnimationClips.meta b/Assets/NaughtyController/Characters/Ellen/AnimationClips.meta
diff --git a/Assets/NaughtyController/Characters/Ellen/AnimationClips/@EllenCombo1.fbx b/Assets/NaughtyController/Characters/Ellen/AnimationClips/@EllenCombo1.fbx