Feature/gd cchanges (#196)

* Terrain * World Building Polish
Lightanic · Mar 12, 2019 · cc2f826 · cc2f826
1 parent 8a2c636
commit cc2f826
Show file tree

Hide file tree

Showing 137 changed files with 23,512 additions and 802 deletions.
diff --git a/Assets/Desert/Top-Down Desert Pack/Materials/skeleton_diffuse.mat b/Assets/Desert/Top-Down Desert Pack/Materials/skeleton_diffuse.mat
@@ -8,9 +8,9 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: skeleton_diffuse
-  m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
-  m_LightmapFlags: 1
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -64,19 +64,21 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.39
+    - _EmissionScaleUI: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
+    - _SmoothnessTextureChannel: 1
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 1}
+    - _EmissionColor: {r: 0.4509804, g: 0.4509804, b: 0.4509804, a: 1}
+    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Imports/Cave.meta b/Assets/Imports/Cave.meta
diff --git a/Assets/Imports/Cave/mesh.meta b/Assets/Imports/Cave/mesh.meta
diff --git a/Assets/Imports/Cave/mesh/Materials.meta b/Assets/Imports/Cave/mesh/Materials.meta
diff --git a/Assets/Imports/Cave/texture.meta b/Assets/Imports/Cave/texture.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack.meta b/Assets/Imports/Desert/Top-Down Desert Pack.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Materials.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Materials.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Mesh.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Mesh.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Camp.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Camp.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Materials.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Materials.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Ruins.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Ruins.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Ruins/Materials.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Mesh/Ruins/Materials.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Prefab.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Prefab.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Prefab/Ruins.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Prefab/Ruins.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Shader.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Shader.meta
diff --git a/Assets/Imports/Desert/Top-Down Desert Pack/Texture.meta b/Assets/Imports/Desert/Top-Down Desert Pack/Texture.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins.meta b/Assets/Imports/Top-Down Forest Ruins.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh.meta b/Assets/Imports/Top-Down Forest Ruins/mesh.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/Materials.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/Materials.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/nature.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/nature.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/nature/Materials.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/nature/Materials.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/ruins 2.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/ruins 2.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/ruins 2/Materials.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/ruins 2/Materials.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/ruins.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/ruins.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/ruins/Materials.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/ruins/Materials.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/stone.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/stone.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/mesh/stone/Materials.meta b/Assets/Imports/Top-Down Forest Ruins/mesh/stone/Materials.meta
diff --git a/Assets/Imports/Top-Down Forest Ruins/texture.meta b/Assets/Imports/Top-Down Forest Ruins/texture.meta
diff --git a/Assets/Imports/World Building.meta b/Assets/Imports/World Building.meta
diff --git a/Assets/Models/Environment/Materials/LightSensitiveDoorFillMaterial.mat b/Assets/Models/Environment/Materials/LightSensitiveDoorFillMaterial.mat
@@ -82,6 +82,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 0.8236121, b: 0.10849059, a: 1}
+    - _Color: {r: 0.3584906, g: 0.2897707, b: 0.01183696, a: 1}
     - _EmissionColor: {r: 51.43178, g: 2.0346036, b: 0, a: 1}
     - _SecondaryEmissionColor: {r: 2, g: 2, b: 2, a: 1}
diff --git a/Assets/Resources/Fonts.meta b/Assets/Resources/Fonts.meta
diff --git a/Assets/Resources/Models.meta b/Assets/Resources/Models.meta
diff --git a/Assets/Resources/Models/Enemies.meta b/Assets/Resources/Models/Enemies.meta
diff --git a/Assets/Resources/Models/Enemies/Lunger.meta b/Assets/Resources/Models/Enemies/Lunger.meta
diff --git a/Assets/Resources/Models/Enemies/Lunger/Animation.meta b/Assets/Resources/Models/Enemies/Lunger/Animation.meta
diff --git a/Assets/Resources/Models/Enemies/Lunger/Mesh.meta b/Assets/Resources/Models/Enemies/Lunger/Mesh.meta
diff --git a/Assets/Resources/Models/Enemies/Lunger/Texture.meta b/Assets/Resources/Models/Enemies/Lunger/Texture.meta
diff --git a/Assets/Resources/Models/Enemies/Runner.meta b/Assets/Resources/Models/Enemies/Runner.meta
diff --git a/Assets/Resources/Models/Enemies/stunner.meta b/Assets/Resources/Models/Enemies/stunner.meta
diff --git a/Assets/Resources/Models/Environment.meta b/Assets/Resources/Models/Environment.meta
diff --git a/Assets/Resources/Models/Environment/AlienShroom1b.meta b/Assets/Resources/Models/Environment/AlienShroom1b.meta