Merge remote-tracking branch 'upstream/develop' into bugfix/chart-sel…

…ection
FunkinCrew · Sep 25, 2024 · 25a64c9 · 25a64c9
2 parents 01466d2 + c3f982b
commit 25a64c9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/example_mods/introMod/_polymod_meta.json b/example_mods/introMod/_polymod_meta.json
@@ -6,7 +6,7 @@
       "name": "EliteMasterEric"
     }
   ],
-  "api_version": "0.1.0",
+  "api_version": "0.5.0",
   "mod_version": "1.0.0",
   "license": "Apache-2.0"
 }
diff --git a/example_mods/testing123/_polymod_meta.json b/example_mods/testing123/_polymod_meta.json
@@ -6,7 +6,7 @@
       "name": "EliteMasterEric"
     }
   ],
-  "api_version": "0.1.0",
+  "api_version": "0.5.0",
   "mod_version": "1.0.0",
   "license": "Apache-2.0"
 }
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
     GameOverSubState.reset();
     PauseSubState.reset();
     Countdown.reset();
-    PopUpStuff.reset();
 
     // Clear the static reference to this state.
     instance = null;

diff --git a/source/funkin/play/components/PopUpStuff.hx b/source/funkin/play/components/PopUpStuff.hx
@@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
       daLoop++;
     }
   }
-
-  /**
-   * Reset the popup configuration to the default.
-   */
-  public static function reset()
-  {
-    noteStyle = NoteStyleRegistry.instance.fetchDefault();
-    isPixel = false;
-  }
 }
diff --git a/source/funkin/ui/debug/anim/DebugBoundingState.hx b/source/funkin/ui/debug/anim/DebugBoundingState.hx
@@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
   {
     // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
     var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
-    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam);
+    return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
   }
 
   override function create()