Player animation and new player model. Added in main menu and victory…

… screen.
GameDev · Nov 11, 2013 · 8d071c3 · 8d071c3
1 parent a3a39ac
commit 8d071c3
Show file tree

Hide file tree

Showing 63 changed files with 1,783 additions and 35 deletions.
diff --git a/TechDemo/Assembly-CSharp-firstpass.pidb b/TechDemo/Assembly-CSharp-firstpass.pidb
diff --git a/TechDemo/Assembly-CSharp.pidb b/TechDemo/Assembly-CSharp.pidb
diff --git a/TechDemo/Assembly-UnityScript-firstpass.pidb b/TechDemo/Assembly-UnityScript-firstpass.pidb
diff --git a/TechDemo/Assets/AnimationExample.unity b/TechDemo/Assets/AnimationExample.unity
diff --git a/TechDemo/Assets/AnimationExample.unity.meta b/TechDemo/Assets/AnimationExample.unity.meta
diff --git a/TechDemo/Assets/Materials/PlayerSpriteSheet.mat b/TechDemo/Assets/Materials/PlayerSpriteSheet.mat
diff --git a/TechDemo/Assets/Materials/PlayerSpriteSheet.mat.meta b/TechDemo/Assets/Materials/PlayerSpriteSheet.mat.meta
diff --git a/TechDemo/Assets/Materials/PlayerSpriteSheet2.mat b/TechDemo/Assets/Materials/PlayerSpriteSheet2.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: PlayerSpriteSheet2
+  m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 3d4e2dfa0640f5d47839f6986deeb041, type: 3}
+          m_Scale: {x: -.25, y: -.25}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
diff --git a/TechDemo/Assets/Materials/PlayerSpriteSheet2.mat.meta b/TechDemo/Assets/Materials/PlayerSpriteSheet2.mat.meta
diff --git a/TechDemo/Assets/Materials/todd-sprite-sheet.mat b/TechDemo/Assets/Materials/todd-sprite-sheet.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: todd-sprite-sheet
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 3d4e2dfa0640f5d47839f6986deeb041, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
diff --git a/TechDemo/Assets/Materials/todd-sprite-sheet.mat.meta b/TechDemo/Assets/Materials/todd-sprite-sheet.mat.meta
diff --git a/TechDemo/Assets/3D Platformer Tutorial.meta → TechDemo/Assets/Models.meta b/TechDemo/Assets/3D Platformer Tutorial.meta → TechDemo/Assets/Models.meta
diff --git a/TechDemo/Assets/Models/Materials.meta b/TechDemo/Assets/Models/Materials.meta
diff --git a/TechDemo/Assets/Models/Materials/No Name.mat b/TechDemo/Assets/Models/Materials/No Name.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: No Name
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
diff --git a/TechDemo/Assets/Models/Materials/No Name.mat.meta b/TechDemo/Assets/Models/Materials/No Name.mat.meta
diff --git a/TechDemo/Assets/Models/Materials/None.mat b/TechDemo/Assets/Models/Materials/None.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: None
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: .800000012, g: .800000012, b: .800000012, a: 1}
diff --git a/TechDemo/Assets/Models/Materials/None.mat.meta b/TechDemo/Assets/Models/Materials/None.mat.meta
diff --git a/TechDemo/Assets/Models/Materials/lambert1.mat b/TechDemo/Assets/Models/Materials/lambert1.mat
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: lambert1
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats: {}
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: .5, g: .5, b: .5, a: 1}
diff --git a/TechDemo/Assets/Models/Materials/lambert1.mat.meta b/TechDemo/Assets/Models/Materials/lambert1.mat.meta
diff --git a/TechDemo/Assets/Models/VertPlane.fbx b/TechDemo/Assets/Models/VertPlane.fbx
diff --git a/TechDemo/Assets/Models/VertPlane.fbx.meta b/TechDemo/Assets/Models/VertPlane.fbx.meta
diff --git a/TechDemo/Assets/PlayerSpriteSheet.png b/TechDemo/Assets/PlayerSpriteSheet.png
diff --git a/TechDemo/Assets/PlayerSpriteSheet.png.meta b/TechDemo/Assets/PlayerSpriteSheet.png.meta
diff --git a/TechDemo/Assets/PlayerSpriteSheet2.png b/TechDemo/Assets/PlayerSpriteSheet2.png
diff --git a/TechDemo/Assets/PlayerSpriteSheet2.png.meta b/TechDemo/Assets/PlayerSpriteSheet2.png.meta
diff --git a/TechDemo/Assets/Prefabs.meta b/TechDemo/Assets/Prefabs.meta