Merge branch 'main' into internal-merge

# Conflicts:
#	.github/workflows/linux.yml
#	.github/workflows/macos.yml
#	.github/workflows/release.yml
#	.github/workflows/windows.yml
#	source/funkin/menus/FreeplayState.hx
#	source/openfl/utils/Assets.hx
This commit is contained in:
Ralty
2026-04-07 10:42:35 +07:00
14 changed files with 180 additions and 70 deletions
+2 -4
View File
@@ -440,11 +440,9 @@ final class CoolUtil
* @param fadeIn
*/
@:noUsing public static function playMenuSong(fadeIn:Bool = false) {
if (FlxG.sound.music == null || !FlxG.sound.music.playing)
{
if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
playMusic(Paths.music(Flags.DEFAULT_MENU_MUSIC), true, fadeIn ? 0 : 1, true, 102);
if (fadeIn)
FlxG.sound.music.fadeIn(4, 0, 0.7);
if (fadeIn) FlxG.sound.music.fadeIn(4, 0, 1);
}
}