Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

2020-02-02 15:04:22 -05:00
parent 87c7b5f447 34ee0e7357
commit 94ace763a5
93 changed files with 8439 additions and 1243 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -14,4 +14,7 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/LevelOne.unity
    guid: cd116069cf09228429be9a55fc0555ad
+  - enabled: 1
+    path: Assets/Scenes/GameOver.unity
+    guid: 1bfc23a9efcc95743ab0ecbee6d66e30
  m_configObjects: {}
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -6,6 +6,8 @@ TagManager:
  tags:
  - Pizza
  - Coffee
+  - Kat Bug
+  - Jack Bug
  layers:
  - Default
  - TransparentFX
@@ -49,3 +51,6 @@ TagManager:
  - name: Stats
    uniqueID: 4179335367
    locked: 0
+  - name: Control Buttons
+    uniqueID: 2641203435
+    locked: 0