Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/Scipts/Map.cs

@@ -68,7 +68,11 @@ public class Map : MonoBehaviour
                 Tile.transform.position = position;
                 Tile.transform.Rotate(Vector3.up, RandomRotation);
                 Tile.name = "Tile [" + x + "," + z + "]";
+
+
                 PopulateTile(Tile.GetComponent<Tile>());
+
+
                 if (x == 0)
                 {
                     Vector3 newPos = position;
@@ -172,7 +176,7 @@ public class Map : MonoBehaviour
             if (Landmarks.Count > 0)
             {
                 int rand = Random.Range(0, Landmarks.Count);
-                Instantiate(Landmarks[rand], LP.transform.position, Quaternion.identity, tile.transform.parent);
+                Instantiate(Landmarks[rand], LP.transform.position, Quaternion.identity, tile.transform);
                 Landmarks.Remove(Landmarks[rand]);
             }
         }

Assets/Shaders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f87a054963b01dc4c8aa2e3ffedcca21
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/WorldAssets.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7da0e8d0a6415f944aa43dff57b38ae3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/WorldAssets/Models.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c207356b78ec8e8499bb6047218dd104
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: