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
2025-07-19 19:17:27 +07:00
parent ba525ac0e4 c987a0cd19
commit b1829aa4ad
19 changed files with 1295 additions and 345 deletions
@@ -53,7 +53,7 @@ class GameplayOptions extends OptionsScreen {
 				__lastBeat = Conductor.curBeat;
 			}

-			var beat = Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat);
+			var beat = Math.floor(Conductor.getTimeInBeats(FlxG.sound.music.time));
 			if (__lastSongBeat != beat) {
 				__metronome.replay();
 				__lastSongBeat = beat;