Merge branch 'better-desert' into develop

* better-desert: Replaced desert world
griffinteller · Jun 15, 2020 · 2a01039 · 2a01039
2 parents 7996374 + 00f52a8
commit 2a01039
Show file tree

Hide file tree

Showing 51 changed files with 984 additions and 187 deletions.
diff --git a/Assets/Scenes/DesertScene.unity b/Assets/Scenes/DesertScene.unity
diff --git a/Assets/Scenes/DesertScene/LightingData.asset b/Assets/Scenes/DesertScene/LightingData.asset
diff --git a/Assets/Scenes/DesertScene/Lightmap-0_comp_dir.png b/Assets/Scenes/DesertScene/Lightmap-0_comp_dir.png
diff --git a/Assets/Scenes/DesertScene/Lightmap-0_comp_light.exr b/Assets/Scenes/DesertScene/Lightmap-0_comp_light.exr
diff --git a/Assets/Scenes/DesertScene/Lightmap-1_comp_dir.png b/Assets/Scenes/DesertScene/Lightmap-1_comp_dir.png
diff --git a/Assets/Scenes/DesertScene/Lightmap-1_comp_light.exr b/Assets/Scenes/DesertScene/Lightmap-1_comp_light.exr
diff --git a/Assets/Scenes/DesertScene/Lightmap-2_comp_dir.png b/Assets/Scenes/DesertScene/Lightmap-2_comp_dir.png
diff --git a/Assets/Scenes/DesertScene/Lightmap-2_comp_light.exr b/Assets/Scenes/DesertScene/Lightmap-2_comp_light.exr
diff --git a/Assets/Scenes/DesertScene/Lightmap-3_comp_dir.png b/Assets/Scenes/DesertScene/Lightmap-3_comp_dir.png
diff --git a/Assets/Scenes/DesertScene/Lightmap-3_comp_light.exr b/Assets/Scenes/DesertScene/Lightmap-3_comp_light.exr
diff --git a/Assets/Scripts/GameDirection/GameDirector.cs b/Assets/Scripts/GameDirection/GameDirector.cs
@@ -24,7 +24,7 @@ public abstract class GameDirector : MonoBehaviourPunCallbacks
         public static readonly Dictionary<MapEnum, Vector3> BaseStartingPositions = new Dictionary<MapEnum, Vector3>
         {
             {MapEnum.Highlands, new Vector3(-280, 0, -410)},
-            {MapEnum.Desert, new Vector3(-385, 0, -1326)}
+            {MapEnum.Desert, new Vector3(98, 0, -130)}
         };
 
         private bool _fullyLoaded;
@@ -33,8 +33,7 @@ public abstract class GameDirector : MonoBehaviourPunCallbacks
 
         public abstract GameModeEnum GameMode { get; }
         public MapEnum Map { get; set; }
-
-
+
         public bool FullyLoaded
         {
             get => _fullyLoaded;

diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_02/Description.xml b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_02/Description.xml
@@ -1,7 +1,7 @@
 <WorldCreator Version="2.0">
-  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="97aece38-c646-4d58-991f-4c3cce2dc282">
+  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="784c6957-5b92-43df-9517-9508b5e45ab2">
     <Diffuse File="Ground_KalahariRockFaces_col.png" Time="131899138560000000" />
     <Normal File="Ground_KalahariRockFaces_norm.png" Time="131899141260000000" />
-    <Displacement File="" Time="132364858121073675" />
+    <Displacement File="" Time="132367294091824167" />
   </Textures>
 </WorldCreator>
diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_020/Description.xml b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_020/Description.xml
@@ -1,7 +1,7 @@
 <WorldCreator Version="2.0">
-  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="97aece38-c646-4d58-991f-4c3cce2dc282">
+  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="784c6957-5b92-43df-9517-9508b5e45ab2">
     <Diffuse File="Ground_KalahariRockFaces_col.png" Time="131899138560000000" />
     <Normal File="Ground_KalahariRockFaces_norm.png" Time="131899141260000000" />
-    <Displacement File="" Time="132364858121183614" />
+    <Displacement File="" Time="132367294091970374" />
   </Textures>
 </WorldCreator>
diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_021/Description.xml b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_021/Description.xml
@@ -1,7 +1,7 @@
 <WorldCreator Version="2.0">
-  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="97aece38-c646-4d58-991f-4c3cce2dc282">
+  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="784c6957-5b92-43df-9517-9508b5e45ab2">
     <Diffuse File="Ground_KalahariRockFaces_col.png" Time="131899138560000000" />
     <Normal File="Ground_KalahariRockFaces_norm.png" Time="131899141260000000" />
-    <Displacement File="" Time="132364858121426561" />
+    <Displacement File="" Time="132367294092090615" />
   </Textures>
 </WorldCreator>
diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022.meta b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022.meta
diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Description.xml b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Description.xml
@@ -0,0 +1,7 @@
+<WorldCreator Version="2.0">
+  <Textures Preview="preview.png" Tags="rocky" Description="" Publisher="GameTextures" Website="https://www.gametextures.com/" Guid="784c6957-5b92-43df-9517-9508b5e45ab2">
+    <Diffuse File="Ground_KalahariRockFaces_col.png" Time="131899138560000000" />
+    <Normal File="Ground_KalahariRockFaces_norm.png" Time="131899141260000000" />
+    <Displacement File="" Time="132367294092200670" />
+  </Textures>
+</WorldCreator>
diff --git a/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Description.xml.meta b/Assets/WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Description.xml.meta
diff --git a/...dCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col.png b/...dCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col.png
diff --git a/.../WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col.png.meta b/.../WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col.png.meta
diff --git a/...orTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col_thumb.png b/...orTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col_thumb.png
diff --git a/...CreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col_thumb.png.meta b/...CreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_col_thumb.png.meta
diff --git a/...CreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm.png b/...CreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm.png
diff --git a/...WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm.png.meta b/...WorldCreatorTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm.png.meta
diff --git a/...rTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm_thumb.png b/...rTerrains/DesertTerrain/Assets/Rock_022/Ground_KalahariRockFaces_norm_thumb.png