From d22cb1a96f354b2ec650a38ec937cd9fac955aee Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 13 Mar 2024 17:38:00 -0400
Subject: [PATCH 1/2] Fix some issues resulting in release builds breaking!
---
.vscode/settings.json | 10 ++++++++++
Project.xml | 11 +++++++----
assets | 2 +-
source/funkin/audio/visualize/SpectogramSprite.hx | 1 -
.../charting/handlers/ChartEditorDialogHandler.hx | 9 +++++++--
source/funkin/ui/freeplay/DJBoyfriend.hx | 2 +-
6 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 87ed06aed..fa036f0e9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -180,6 +180,16 @@
"target": "windows",
"args": ["-debug", "-DWAVEFORM", "-DFORCE_DEBUG_VERSION"]
},
+ {
+ "label": "Windows / Release",
+ "target": "windows",
+ "args": ["-release"]
+ },
+ {
+ "label": "Windows / Release (GitHub Actions)",
+ "target": "windows",
+ "args": ["-release", "-DGITHUB_BUILD"]
+ },
{
"label": "HashLink / Debug (Waveform Test)",
"target": "hl",
diff --git a/Project.xml b/Project.xml
index 99c46ef9f..76d9bbe5e 100644
--- a/Project.xml
+++ b/Project.xml
@@ -91,8 +91,11 @@
NOT USING A DIRECT THING TO THE ASSET!!!
-->
<assets path="assets/fonts" embed="true" />
- <!-- If compiled via github actions, enable force debug -->
- <set name="FORCE_DEBUG_VERSION" if="GITHUB_BUILD"/>
+
+ <!-- If compiled via github actions, show debug version number. -->
+ <define name="FORCE_DEBUG_VERSION" if="GITHUB_BUILD" />
+ <define name="NO_REDIRECT_ASSETS_FOLDER" if="GITHUB_BUILD" />
+
<!-- _______________________________ Libraries ______________________________ -->
<haxelib name="lime" /> <!-- Game engine backend -->
<haxelib name="openfl" /> <!-- Game engine backend -->
@@ -216,9 +219,9 @@
<postbuild haxe="source/Postbuild.hx"/> -->
<!-- Enable this on platforms which do not support dropping files onto the window. -->
- <set name="FILE_DROP_UNSUPPORTED" if="mac" />
+ <haxedef name="FILE_DROP_UNSUPPORTED" if="mac" />
<section unless="FILE_DROP_UNSUPPORTED">
- <set name="FILE_DROP_SUPPORTED" />
+ <haxedef name="FILE_DROP_SUPPORTED" />
</section>
<!-- Options for Polymod -->
diff --git a/assets b/assets
index fe8c987eb..a9c472d5d 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit fe8c987eb846ceb73b8518879b506111aaccdf80
+Subproject commit a9c472d5d3ae1729dc109ab50c2f9824dbb9e5e7
diff --git a/source/funkin/audio/visualize/SpectogramSprite.hx b/source/funkin/audio/visualize/SpectogramSprite.hx
index 470dbf7fe..636c0726a 100644
--- a/source/funkin/audio/visualize/SpectogramSprite.hx
+++ b/source/funkin/audio/visualize/SpectogramSprite.hx
@@ -4,7 +4,6 @@ import flixel.FlxSprite;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
import flixel.math.FlxMath;
import flixel.math.FlxPoint;
-import flixel.math.FlxVector;
import flixel.sound.FlxSound;
import flixel.util.FlxColor;
import funkin.audio.visualize.PolygonSpectogram.VISTYPE;
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
index 970f021ac..b84c68f8d 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
@@ -808,7 +808,8 @@ class ChartEditorDialogHandler
}
songVariationMetadataEntry.onClick = onClickMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel);
#if FILE_DROP_SUPPORTED
- addDropHandler(songVariationMetadataEntry, onDropFileMetadataVariation.bind(variation).bind(songVariationMetadataEntryLabel));
+ state.addDropHandler({component: songVariationMetadataEntry, handler: onDropFileMetadataVariation.bind(variation)
+ .bind(songVariationMetadataEntryLabel)});
#end
chartContainerB.addComponent(songVariationMetadataEntry);
@@ -832,7 +833,11 @@ class ChartEditorDialogHandler
}
songVariationChartDataEntry.onClick = onClickChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel);
#if FILE_DROP_SUPPORTED
- addDropHandler(songVariationChartDataEntry, onDropFileChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel));
+ state.addDropHandler(
+ {
+ component: songVariationChartDataEntry,
+ handler: onDropFileChartDataVariation.bind(variation).bind(songVariationChartDataEntryLabel)
+ });
#end
chartContainerB.addComponent(songVariationChartDataEntry);
}
diff --git a/source/funkin/ui/freeplay/DJBoyfriend.hx b/source/funkin/ui/freeplay/DJBoyfriend.hx
index 9d37fe2c1..55f43d2ef 100644
--- a/source/funkin/ui/freeplay/DJBoyfriend.hx
+++ b/source/funkin/ui/freeplay/DJBoyfriend.hx
@@ -4,7 +4,7 @@ import flixel.FlxSprite;
import flixel.util.FlxSignal;
import funkin.util.assets.FlxAnimationUtil;
import funkin.graphics.adobeanimate.FlxAtlasSprite;
-import flixel.system.FlxSound;
+import flixel.sound.FlxSound;
import flixel.util.FlxTimer;
import funkin.audio.FlxStreamSound;
From 0d2167d330b9a6a5e0720b3b8210d0ddda614c5f Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 14 Mar 2024 03:08:51 -0700
Subject: [PATCH 2/2] assets submod
---
assets | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets b/assets
index a9c472d5d..0e2c5bf21 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit a9c472d5d3ae1729dc109ab50c2f9824dbb9e5e7
+Subproject commit 0e2c5bf2134c7e517b70cf74afd58abe5c7b5e50