Merge branch 'master' of github.com:brean/ggj2020

brean · Feb 2, 2020 · c4e25bb · c4e25bb
2 parents f6955c1 + 39a4912
commit c4e25bb
Show file tree

Hide file tree

Showing 13 changed files with 607 additions and 240 deletions.
diff --git a/Assets/BuildingManager.cs b/Assets/BuildingManager.cs
@@ -25,6 +25,9 @@ void OnValidate() {
     void Awake()
     {
         GameObject grid = GameObject.Find("Grid - Level");
+        if (!grid) {
+            return;
+        }
         storeysLevel = new List<Tilemap>();
         tileMaps = new List<Tilemap>();
         foreach(Transform child in grid.transform)

diff --git a/Assets/Images/TitleScreen_textless_16-9.png b/Assets/Images/TitleScreen_textless_16-9.png
diff --git a/Assets/Images/TitleScreen_textless_16-9.png.meta b/Assets/Images/TitleScreen_textless_16-9.png.meta
diff --git a/Assets/Images/TitleScreen_textless_2k.png b/Assets/Images/TitleScreen_textless_2k.png
diff --git a/Assets/Images/TitleScreen_textless_2k.png.meta b/Assets/Images/TitleScreen_textless_2k.png.meta
diff --git a/Assets/Images/WinScreenArtisans_16-9.png b/Assets/Images/WinScreenArtisans_16-9.png
diff --git a/Assets/Images/WinScreenArtisans_16-9.png.meta b/Assets/Images/WinScreenArtisans_16-9.png.meta
diff --git a/Assets/Images/WinScreenArtisans_2K.png b/Assets/Images/WinScreenArtisans_2K.png
diff --git a/Assets/Images/WinScreenArtisans_2K.png.meta b/Assets/Images/WinScreenArtisans_2K.png.meta