cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-22 13:13:47 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Cameron Taylor 2024-01-01 19:09:36 -05:00
parent edd8bdc014 7afb862072
commit 11d21c1369
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hmm.json
View file

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

11
source/funkin/play/GameOverSubState.hx
View file

@ -66,11 +66,14 @@ class GameOverSubState extends MusicBeatSubState
var isChartingMode:Bool = false; var isChartingMode:Bool = false;
public function new(?params:GameOverParams) var transparent:Bool;
public function new(params:GameOverParams)
{ {
super(); super();
this.isChartingMode = params?.isChartingMode ?? false; this.isChartingMode = params?.isChartingMode ?? false;
transparent = params.transparent;
} }
/** /**
@ -91,9 +94,10 @@ class GameOverSubState extends MusicBeatSubState
// //
// Add a black background to the screen. // 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); 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(); bg.scrollFactor.set();
add(bg); add(bg);
@ -326,4 +330,5 @@ class GameOverSubState extends MusicBeatSubState
typedef GameOverParams = typedef GameOverParams =
{ {
var isChartingMode:Bool; var isChartingMode:Bool;
var transparent:Bool;
} }

1
source/funkin/play/PlayState.hx
View file

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

2
source/funkin/ui/haxeui/components/CharacterPlayer.hx
View file

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