From 5f5b2bb80b4fed29f5046dd26c046659372e6df4 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 13 Feb 2024 00:00:27 -0500 Subject: [PATCH 1/4] pico death animation loop fix --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 594853037..3e6c397d1 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 594853037cbea06caa5c141b0d9ed3736818e592 +Subproject commit 3e6c397d11d190fcbf90545dc35110b2bde7830c From 1d8e82b108a75455948d9ba8e292e6eda46fa029 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 13 Feb 2024 00:18:47 -0500 Subject: [PATCH 2/4] makes prebuild.hx actually run on prebuild --- Project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.xml b/Project.xml index 560baeadf..d15a5affd 100644 --- a/Project.xml +++ b/Project.xml @@ -213,7 +213,7 @@ - --> + --> --> From 681cfa0883d9ac823cc768301708bc5d14bf04d3 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 13 Feb 2024 01:16:09 -0500 Subject: [PATCH 3/4] chart editor waveform fixes for single vocal audio files --- .../charting/toolboxes/ChartEditorFreeplayToolbox.hx | 2 +- .../charting/toolboxes/ChartEditorOffsetsToolbox.hx | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx index 8d3554a08..c384e7a6d 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorFreeplayToolbox.hx @@ -290,7 +290,7 @@ class ChartEditorFreeplayToolbox extends ChartEditorBaseToolbox // waveformMusic.waveform.forceUpdate = true; var perfStart = haxe.Timer.stamp(); var waveformData1 = playerVoice.waveformData; - var waveformData2 = opponentVoice.waveformData; + var waveformData2 = opponentVoice?.waveformData ?? playerVoice.waveformData; // this null check is for songs that only have 1 vocals file! var waveformData3 = chartEditorState.audioInstTrack.waveformData; var waveformData = waveformData1.merge(waveformData2).merge(waveformData3); trace('Waveform data merging took: ${haxe.Timer.stamp() - perfStart} seconds'); diff --git a/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx b/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx index 67ca82b1b..fd9209294 100644 --- a/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx +++ b/source/funkin/ui/debug/charting/toolboxes/ChartEditorOffsetsToolbox.hx @@ -276,8 +276,13 @@ class ChartEditorOffsetsToolbox extends ChartEditorBaseToolbox // Build opponent waveform. // waveformOpponent.waveform.forceUpdate = true; - waveformOpponent.waveform.waveformData = opponentVoice.waveformData; - waveformOpponent.waveform.duration = opponentVoice.length / Constants.MS_PER_SEC; + // note: if song only has one set of vocals (Vocals.ogg/mp3) then this is null and crashes charting editor + // so we null check + if (opponentVoice != null) + { + waveformOpponent.waveform.waveformData = opponentVoice.waveformData; + waveformOpponent.waveform.duration = opponentVoice.length / Constants.MS_PER_SEC; + } // Build instrumental waveform. // waveformInstrumental.waveform.forceUpdate = true; From e3623311743dd0f8a6d799ea3311cf2b0f46a19b Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 13 Feb 2024 01:19:00 -0500 Subject: [PATCH 4/4] assets submod update --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 3e6c397d1..160acbd8a 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 3e6c397d11d190fcbf90545dc35110b2bde7830c +Subproject commit 160acbd8a854a9f677ef7587396340e79a5ea6ca