gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'Time-Signature-Changes' into new-conductor

Browse Source 
# Conflicts:
#	.gitignore
#	source/funkin/backend/FunkinSprite.hx
#	source/funkin/backend/chart/ChartData.hx
#	source/funkin/backend/chart/EventsData.hx
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterEvent.hx
#	source/funkin/editors/charter/CharterEventScreen.hx
#	source/funkin/editors/charter/CharterMetaDataScreen.hx
#	source/funkin/editors/charter/SongCreationScreen.hx
#	source/funkin/game/PlayState.hx
This commit is contained in:
Ralty
2025-07-16 19:27:05 +07:00
parent c4af35d9dd 34b4de31fc
commit e4be3bd427
32 changed files with 1288 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/options/categories/GameplayOptions.hx
+1 -1
View File
@@ -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;