Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes

hmm.json

@@ -11,7 +11,7 @@
       "name": "flixel",
       "type": "git",
       "dir": null,
-      "ref": "9bdea914f3d0485b9b3ec158f28875b5ac95d476",
+      "ref": "a83738673e7edbf8acba3a1426af284dfe6719fe",
       "url": "https://github.com/FunkinCrew/flixel"
     },
     {
@@ -54,14 +54,14 @@
       "name": "haxeui-core",
       "type": "git",
       "dir": null,
-      "ref": "7021f1fbab928268d9196a73e7f47461ca3c3e4d",
+      "ref": "e765a3e0b7a653823e8dec765e04623f27f573f8",
       "url": "https://github.com/haxeui/haxeui-core"
     },
     {
       "name": "haxeui-flixel",
       "type": "git",
       "dir": null,
-      "ref": "26b6bb132c92dfa9b77b4a61eaeda8f9a9efda98",
+      "ref": "7a517d561eff49d8123c128bf9f5c1123b84d014",
       "url": "https://github.com/haxeui/haxeui-flixel"
     },
     {

source/funkin/play/GameOverSubState.hx

@@ -66,11 +66,14 @@ class GameOverSubState extends MusicBeatSubState
 
   var isChartingMode:Bool = false;
 
-  public function new(?params:GameOverParams)
+  var transparent:Bool;
+
+  public function new(params:GameOverParams)
   {
     super();
 
     this.isChartingMode = params?.isChartingMode ?? false;
+    transparent = params.transparent;
   }
 
   /**
@@ -91,9 +94,10 @@ class GameOverSubState extends MusicBeatSubState
     //
 
     // Add a black background to the screen.
-    // We make this transparent so that we can see the stage underneath during debugging.
     var bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
-    bg.alpha = 0.25;
+    // We make this transparent so that we can see the stage underneath during debugging,
+    // but it's normally opaque.
+    bg.alpha = transparent ? 0.25 : 1.0;
     bg.scrollFactor.set();
     add(bg);
 
@@ -326,4 +330,5 @@ class GameOverSubState extends MusicBeatSubState
 typedef GameOverParams =
 {
   var isChartingMode:Bool;
+  var transparent:Bool;
 }

source/funkin/play/PlayState.hx

@@ -925,6 +925,7 @@ class PlayState extends MusicBeatSubState
         var gameOverSubState = new GameOverSubState(
           {
             isChartingMode: isChartingMode
+            transparent: persistentDraw,
           });
         FlxTransitionableSubState.skipNextTransIn = true;
         FlxTransitionableSubState.skipNextTransOut = true;

source/funkin/ui/haxeui/components/CharacterPlayer.hx

@@ -35,7 +35,7 @@ class CharacterPlayer extends Box
   public function new(defaultToBf:Bool = true)
   {
     super();
-    _overrideSkipTransformChildren = false;
+    // _overrideSkipTransformChildren = false;
 
     if (defaultToBf)
     {