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:
Ralty
2025-07-19 19:17:27 +07:00
19 changed files with 1295 additions and 345 deletions
+1 -1
View File
@@ -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);
}