Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb

2023-04-29 14:53:30 -07:00
parent f2b44b6d96 405e20ca2f
commit fa22316d17
11 changed files with 10894 additions and 528 deletions
--- a/Assets/Scenes/ClarinetScene.unity
+++ b/Assets/Scenes/ClarinetScene.unity
@@ -3593,9 +3593,9 @@ GameObject:
  - component: {fileID: 1600355032}
  - component: {fileID: 1600355031}
  - component: {fileID: 1600355030}
-  m_Layer: 0
+  m_Layer: 6
  m_Name: Swamp
-  m_TagString: Untagged
+  m_TagString: wall
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
--- a/Assets/Scenes/GrappleScene.unity
+++ b/Assets/Scenes/GrappleScene.unity
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -2400,7 +2400,7 @@ MonoBehaviour:
  deathCanvas: {fileID: 0}
  isPaused: 0
  pauseMenuCanvas: {fileID: 0}
-  inDebugMode: 0
+  inDebugMode: 1
 --- !u!114 &2038492347
 MonoBehaviour:
  m_ObjectHideFlags: 0