mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2024-11-22 23:57:50 -05:00
Merge branch 'rewrite/master' into bugfix/may-31st-fixes
This commit is contained in:
commit
de92a7ba5c
3 changed files with 2 additions and 4 deletions
|
@ -830,7 +830,7 @@ class FreeplayState extends MusicBeatSubState
|
|||
dj.fistPump();
|
||||
// rankCamera.fade(FlxColor.BLACK, 0.5, 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;
|
||||
|
||||
originalPos.x = grpCapsules.members[curSelected].x;
|
||||
|
|
|
@ -264,8 +264,6 @@ class SongMenuItem extends FlxSpriteGroup
|
|||
|
||||
function updateBPM(newBPM:Int):Void
|
||||
{
|
||||
trace(newBPM);
|
||||
|
||||
var shiftX:Float = 191;
|
||||
var tempShift:Float = 0;
|
||||
|
||||
|
|
|
@ -124,7 +124,7 @@ class TitleState extends MusicBeatState
|
|||
|
||||
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();
|
||||
add(bg);
|
||||
|
||||
|
|
Loading…
Reference in a new issue