Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-11 16:51:21 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fps-setting

Browse source
This commit is contained in:
lemz 2024-05-29 18:45:09 +02:00 committed by GitHub
commit 262bcc4d8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,9 +67,11 @@ class TitleState extends MusicBeatState
// DEBUG BULLSHIT // DEBUG BULLSHIT
// netConnection.addEventListener(MouseEvent.MOUSE_DOWN, overlay_onMouseDown); // netConnection.addEventListener(MouseEvent.MOUSE_DOWN, overlay_onMouseDown);
new FlxTimer().start(1, function(tmr:FlxTimer) { if (!initialized) new FlxTimer().start(1, function(tmr:FlxTimer) {
startIntro(); startIntro();
}); });
else
startIntro();
} }
function client_onMetaData(metaData:Dynamic) function client_onMetaData(metaData:Dynamic)
@ -118,7 +120,7 @@ class TitleState extends MusicBeatState
function startIntro():Void function startIntro():Void
{ {
playMenuMusic(); if (!initialized || FlxG.sound.music == null) playMenuMusic();
persistentUpdate = true; persistentUpdate = true;
@ -231,7 +233,7 @@ class TitleState extends MusicBeatState
overrideExisting: true, overrideExisting: true,
restartTrack: true restartTrack: true
}); });
// Fade from 0.0 to 0.7 over 4 seconds // Fade from 0.0 to 1 over 4 seconds
if (shouldFadeIn) FlxG.sound.music.fadeIn(4.0, 0.0, 1.0); if (shouldFadeIn) FlxG.sound.music.fadeIn(4.0, 0.0, 1.0);
} }