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

2023-05-05 16:19:35 -07:00
parent fc8a257547 7e75fd24ce
commit 7e2c255fd5
32 changed files with 24814 additions and 2405 deletions
--- a/Assets/Scenes/Brasslands.unity
+++ b/Assets/Scenes/Brasslands.unity
--- a/Assets/Scenes/GameEndScreen.unity
+++ b/Assets/Scenes/GameEndScreen.unity
--- a/Assets/Scenes/GameEndScreen.unity.meta
+++ b/Assets/Scenes/GameEndScreen.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 00a8225591a31417a93122f1eb4e7dff
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/GrappleScene.unity
+++ b/Assets/Scenes/GrappleScene.unity
--- a/Assets/Scenes/GrenouilleVillage.unity
+++ b/Assets/Scenes/GrenouilleVillage.unity
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -914,7 +914,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 2527389465697474493, guid: ff99a7d0beeca415e911378b9b377de4, type: 3}
      propertyPath: showDropdown
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3422388587178177106, guid: ff99a7d0beeca415e911378b9b377de4, type: 3}
      propertyPath: m_Pivot.x
--- a/Assets/Scenes/MushroomForest.unity
+++ b/Assets/Scenes/MushroomForest.unity