Merge branch 'new-conductor' into new-editors-conductor
# Conflicts: # source/funkin/editors/charter/Charter.hx # source/funkin/editors/charter/CharterBackdropGroup.hx # source/funkin/editors/charter/CharterEvent.hx
This commit is contained in:
@@ -471,7 +471,7 @@ final class CoolUtil
|
||||
}
|
||||
|
||||
var bpm:Null<Float> = Std.parseFloat(musicInfo["BPM"]).getDefault(DefaultBPM);
|
||||
Conductor.changeBPM(bpm, beatsPerMeasure, stepsPerBeat);
|
||||
Conductor.changeBPM(bpm, beatsPerMeasure, floorInt(stepsPerBeat));
|
||||
} else
|
||||
Conductor.changeBPM(DefaultBPM);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user