cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-30 18:53:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2

Browse source
This commit is contained in:
EliteMasterEric 2023-12-08 16:12:56 -05:00
parent 64cba7ca2d 2858cbf56b
commit 6060282f20
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

@ -562,7 +562,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);

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

@ -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
}
/**