Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform

Browse source
This commit is contained in:
Cameron Taylor 2023-12-08 18:35:28 -05:00
commit 81432100b8
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -568,7 +568,12 @@ class PlayState extends MusicBeatSubState
// Prepare the Conductor. // Prepare the Conductor.
Conductor.forceBPM(null); Conductor.forceBPM(null);
Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset();
if (currentChart.offsets != null)
{
Conductor.instrumentalOffset = currentChart.offsets.getInstrumentalOffset();
}
Conductor.mapTimeChanges(currentChart.timeChanges); Conductor.mapTimeChanges(currentChart.timeChanges);
Conductor.update((Conductor.beatLengthMs * -5) + startTimestamp); Conductor.update((Conductor.beatLengthMs * -5) + startTimestamp);

5
source/funkin/ui/debug/charting/dialogs/ChartEditorUploadChartDialog.hx
View file

@ -92,7 +92,12 @@ class ChartEditorUploadChartDialog extends ChartEditorBaseDialog
if (this.locked) return; if (this.locked) return;
this.lock(); 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); FileUtil.browseForBinaryFile('Open Chart', [FileUtil.FILE_EXTENSION_INFO_FNFC], onSelectFile, onCancelBrowse);
#else
FileUtil.browseForBinaryFile('Open Chart', null, onSelectFile, onCancelBrowse);
#end
} }
/** /**