Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-22 23:57:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rewrite/master' into bugfix/may-31st-fixes

Browse source
This commit is contained in:
Cameron Taylor 2024-06-01 16:23:37 -04:00
commit de92a7ba5c
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -830,7 +830,7 @@ class FreeplayState extends MusicBeatSubState
dj.fistPump(); dj.fistPump();
// rankCamera.fade(FlxColor.BLACK, 0.5, true); // rankCamera.fade(FlxColor.BLACK, 0.5, true);
rankCamera.fade(0xFF000000, 0.5, true, null, true); rankCamera.fade(0xFF000000, 0.5, true, null, true);
FlxG.sound.music.volume = 0; if (FlxG.sound.music != null) FlxG.sound.music.volume = 0;
rankBg.alpha = 1; rankBg.alpha = 1;
originalPos.x = grpCapsules.members[curSelected].x; originalPos.x = grpCapsules.members[curSelected].x;

2
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -264,8 +264,6 @@ class SongMenuItem extends FlxSpriteGroup
function updateBPM(newBPM:Int):Void function updateBPM(newBPM:Int):Void
{ {
trace(newBPM);
var shiftX:Float = 191; var shiftX:Float = 191;
var tempShift:Float = 0; var tempShift:Float = 0;

2
source/funkin/ui/title/TitleState.hx
View file

@ -124,7 +124,7 @@ class TitleState extends MusicBeatState
persistentUpdate = true; persistentUpdate = true;
var bg:FunkinSprite = new FunkinSprite().makeSolidColor(FlxG.width, FlxG.height, FlxColor.BLACK); var bg:FunkinSprite = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
bg.screenCenter(); bg.screenCenter();
add(bg); add(bg);