Merge branch 'master' of https://github.com/bedder/Telethreat

bedder · Nov 28, 2014 · 2ca894c · 2ca894c
2 parents 25d2790 + 897f017
commit 2ca894c
Show file tree

Hide file tree

Showing 19 changed files with 1,864 additions and 662 deletions.
diff --git a/Assets/Material/Map/Objects/Obstacle.meta b/Assets/Material/Map/Objects/Obstacle.meta
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleCore.mat b/Assets/Material/Map/Objects/Obstacle/ObstacleCore.mat
@@ -0,0 +1,39 @@
+%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: ObstacleCore
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_CustomRenderQueue: -1
+  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}
+      data:
+        first:
+          name: _Illum
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _EmissionLM
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 0, g: 0, b: 0, a: .345098048}
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleCore.mat.meta b/Assets/Material/Map/Objects/Obstacle/ObstacleCore.mat.meta
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleSpecular.mat b/Assets/Material/Map/Objects/Obstacle/ObstacleSpecular.mat
@@ -0,0 +1,36 @@
+%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: ObstacleSpecular
+  m_Shader: {fileID: 3, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_CustomRenderQueue: -1
+  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:
+      data:
+        first:
+          name: _Shininess
+        second: .078125
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _SpecColor
+        second: {r: .25, g: .211397052, b: .211397052, a: 1}
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleSpecular.mat.meta b/Assets/Material/Map/Objects/Obstacle/ObstacleSpecular.mat.meta
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleTranslucent.mat b/Assets/Material/Map/Objects/Obstacle/ObstacleTranslucent.mat
@@ -0,0 +1,28 @@
+%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: ObstacleTranslucent
+  m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_CustomRenderQueue: -1
+  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: 0, g: .213793039, b: 1, a: .345098048}
diff --git a/Assets/Material/Map/Objects/Obstacle/ObstacleTranslucent.mat.meta b/Assets/Material/Map/Objects/Obstacle/ObstacleTranslucent.mat.meta