From 8f30532ed43f597dbb4b08f49faeccfd72f6eb21 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 8 Dec 2023 01:57:46 -0500 Subject: [PATCH 1/2] offsets null fix quick --- source/funkin/play/PlayState.hx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index a26addbe6..c25e4cc41 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -568,7 +568,12 @@ class PlayState extends MusicBeatSubState // Prepare the Conductor. Conductor.forceBPM(null); - Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset(); + + if (currentChart.offsets != null) + { + Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset(); + } + Conductor.mapTimeChanges(currentChart.timeChanges); Conductor.update((Conductor.beatLengthMs * -5) + startTimestamp); From 2858cbf56b0a70d279ef5552637d3ce915b101b6 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 8 Dec 2023 02:14:26 -0500 Subject: [PATCH 2/2] mac file filter fix --- .../debug/charting/dialogs/ChartEditorUploadChartDialog.hx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx index aef5e9feb..49d5593b0 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx @@ -92,7 +92,12 @@ class ChartEditorUploadChartDialog extends ChartEditorBaseDialog if (this.locked) return; this.lock(); + // TODO / BUG: File filtering not working on mac finder dialog, so we don't use it for now + #if !mac FileUtil.browseForBinaryFile('Open Chart', [FileUtil.FILE_EXTENSION_INFO_FNFC], onSelectFile, onCancelBrowse); + #else + FileUtil.browseForBinaryFile('Open Chart', null, onSelectFile, onCancelBrowse); + #end } /**