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

Merge pull request #507 from FunkinCrew/bugfix/wednesday-fixes

Browse source 
Bugfix/wednesday fixes
This commit is contained in:
Cameron Taylor 2024-04-24 19:27:00 -04:00 committed by GitHub
parent bebb16875e d2055ee0b2
commit e72c2ed41b
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Project.xml
View file

@ -239,6 +239,10 @@
<haxedef name="FILE_DROP_SUPPORTED" /> <haxedef name="FILE_DROP_SUPPORTED" />
</section> </section>
<!-- Enable this on platforms which do not support the edsior views. -->
<haxedef name="CHART_EDITOR_UNSUPPORTED" if="web" />
<haxedef name="CHART_EDITOR_SUPPORTED" unless="web"/>
<!-- Options for Polymod --> <!-- Options for Polymod -->
<section if="polymod"> <section if="polymod">
<!-- Turns on additional debug logging. --> <!-- Turns on additional debug logging. -->

2
assets

@ -1 +1 @@
Subproject commit 0e07811217c579df376719c76d47c1e08b3070e2 Subproject commit 1d649965f5fcd4d2f83abea1f3f392b42fd0e270

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

@ -2529,6 +2529,7 @@ class PlayState extends MusicBeatSubState
if (FlxG.keys.justPressed.H) camHUD.visible = !camHUD.visible; if (FlxG.keys.justPressed.H) camHUD.visible = !camHUD.visible;
#end #end
#if CHART_EDITOR_SUPPORTED
// Open the stage editor overlaying the current state. // Open the stage editor overlaying the current state.
if (controls.DEBUG_STAGE) if (controls.DEBUG_STAGE)
{ {
@ -2548,6 +2549,7 @@ class PlayState extends MusicBeatSubState
targetSongId: currentSong.id, targetSongId: currentSong.id,
})); }));
} }
#end
#if (debug || FORCE_DEBUG_VERSION) #if (debug || FORCE_DEBUG_VERSION)
// 1: End the song immediately. // 1: End the song immediately.

2
source/funkin/ui/mainmenu/MainMenuState.hx
View file

@ -323,10 +323,12 @@ class MainMenuState extends MusicBeatState
} }
// Open the debug menu, defaults to ` / ~ // Open the debug menu, defaults to ` / ~
#if CHART_EDITOR_SUPPORTED
if (controls.DEBUG_MENU) if (controls.DEBUG_MENU)
{ {
FlxG.state.openSubState(new DebugMenuSubState()); FlxG.state.openSubState(new DebugMenuSubState());
} }
#end
#if (debug || FORCE_DEBUG_VERSION) #if (debug || FORCE_DEBUG_VERSION)
if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.W) if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.W)