From a2c38a3e1716c56b5aa5bb9f44b8afa6fa85d1ac Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 24 Apr 2024 16:00:33 -0400
Subject: [PATCH 1/3] Revise Weekend 1 charts
---
assets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets b/assets
index 0e0781121..1d649965f 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 0e07811217c579df376719c76d47c1e08b3070e2
+Subproject commit 1d649965f5fcd4d2f83abea1f3f392b42fd0e270
From b6247c933a62c8b5152557f8147f295dd12d4893 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 24 Apr 2024 16:00:50 -0400
Subject: [PATCH 2/3] Disable chart editor on web until it's fixed.
---
Project.xml | 6 ++++++
source/funkin/play/PlayState.hx | 2 ++
source/funkin/ui/mainmenu/MainMenuState.hx | 2 ++
3 files changed, 10 insertions(+)
diff --git a/Project.xml b/Project.xml
index e232fff91..9c72a9532 100644
--- a/Project.xml
+++ b/Project.xml
@@ -239,6 +239,12 @@
<haxedef name="FILE_DROP_SUPPORTED" />
</section>
+ <!-- Enable this on platforms which do not support the edsior views. -->
+ <haxedef name="CHART_EDITOR_UNSUPPORTED" if="html5" />
+ <section unless="CHART_EDITOR_UNSUPPORTED">
+ <haxedef name="CHART_EDITOR_SUPPORTED" />
+ </section>
+
<!-- Options for Polymod -->
<section if="polymod">
<!-- Turns on additional debug logging. -->
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 4e388407e..6e1452aa9 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -2529,6 +2529,7 @@ class PlayState extends MusicBeatSubState
if (FlxG.keys.justPressed.H) camHUD.visible = !camHUD.visible;
#end
+ #if CHART_EDITOR_SUPPORTED
// Open the stage editor overlaying the current state.
if (controls.DEBUG_STAGE)
{
@@ -2548,6 +2549,7 @@ class PlayState extends MusicBeatSubState
targetSongId: currentSong.id,
}));
}
+ #end
#if (debug || FORCE_DEBUG_VERSION)
// 1: End the song immediately.
diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
index f053d39fe..90d79ccc1 100644
--- a/source/funkin/ui/mainmenu/MainMenuState.hx
+++ b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -323,10 +323,12 @@ class MainMenuState extends MusicBeatState
}
// Open the debug menu, defaults to ` / ~
+ #if CHART_EDITOR_SUPPORTED
if (controls.DEBUG_MENU)
{
FlxG.state.openSubState(new DebugMenuSubState());
}
+ #end
#if (debug || FORCE_DEBUG_VERSION)
if (FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.ALT && FlxG.keys.pressed.SHIFT && FlxG.keys.justPressed.W)
From 03b1f17fe2ce5e9e626aa8471c8e72e518a6b096 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Wed, 24 Apr 2024 19:25:05 -0400
Subject: [PATCH 3/3] clearer project.xml haxedefs
---
Project.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Project.xml b/Project.xml
index 9c72a9532..0a44a268c 100644
--- a/Project.xml
+++ b/Project.xml
@@ -240,10 +240,8 @@
</section>
<!-- Enable this on platforms which do not support the edsior views. -->
- <haxedef name="CHART_EDITOR_UNSUPPORTED" if="html5" />
- <section unless="CHART_EDITOR_UNSUPPORTED">
- <haxedef name="CHART_EDITOR_SUPPORTED" />
- </section>
+ <haxedef name="CHART_EDITOR_UNSUPPORTED" if="web" />
+ <haxedef name="CHART_EDITOR_SUPPORTED" unless="web"/>
<!-- Options for Polymod -->
<section if="polymod">