#1 #2 #4 changed the input manager to support both players, new test …

…scene with both characters
vladimirdlc · Feb 10, 2017 · 07d2764 · 07d2764
1 parent 6c6915c
commit 07d2764
Show file tree

Hide file tree

Showing 14 changed files with 2,830 additions and 50 deletions.
diff --git a/Assets/Models.meta b/Assets/Models.meta
diff --git a/Assets/Prefabs/Environmental.meta b/Assets/Prefabs/Environmental.meta
diff --git a/Assets/Prefabs/Test.meta b/Assets/Prefabs/Test.meta
diff --git a/Assets/Prefabs/Shadow Trail Renderer.prefab → ...Prefabs/Test/Shadow Trail Renderer.prefab b/Assets/Prefabs/Shadow Trail Renderer.prefab → ...Prefabs/Test/Shadow Trail Renderer.prefab
diff --git a/...Prefabs/Shadow Trail Renderer.prefab.meta → ...bs/Test/Shadow Trail Renderer.prefab.meta b/...Prefabs/Shadow Trail Renderer.prefab.meta → ...bs/Test/Shadow Trail Renderer.prefab.meta
diff --git a/Assets/Prefabs/Test Shadow Cube.prefab → Assets/Prefabs/Test/Test Shadow Cube.prefab b/Assets/Prefabs/Test Shadow Cube.prefab → Assets/Prefabs/Test/Test Shadow Cube.prefab
diff --git a/Assets/Prefabs/Test Shadow Cube.prefab.meta → ...Prefabs/Test/Test Shadow Cube.prefab.meta b/Assets/Prefabs/Test Shadow Cube.prefab.meta → ...Prefabs/Test/Test Shadow Cube.prefab.meta
diff --git a/Assets/Prefabs/Test/Timeline Manager.prefab b/Assets/Prefabs/Test/Timeline Manager.prefab
@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1399662745363156}
+  m_IsPrefabParent: 1
+--- !u!1 &1399662745363156
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4962955745900804}
+  - component: {fileID: 114472324765550632}
+  m_Layer: 0
+  m_Name: Timeline Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4962955745900804
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1399662745363156}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 323.86365, y: 0.5478251, z: 122.20422}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114472324765550632
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1399662745363156}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cbfd6fa6551202c4c82e600f57f4c6da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shadowPrefab: {fileID: 1614062590372156, guid: fcf9134591e22d94aa1b0215e54cef7b,
+    type: 2}
+  trailRendererPrefab: {fileID: 1788705545930800, guid: 89d696b01c8236c46a0925a288b34308,
+    type: 2}
diff --git a/Assets/Prefabs/Test/Timeline Manager.prefab.meta b/Assets/Prefabs/Test/Timeline Manager.prefab.meta