mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-12 05:07:06 +00:00
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
This commit is contained in:
commit
81432100b8
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue