Ralty e4be3bd427 Merge branch 'Time-Signature-Changes' into new-conductor ...

# 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

2025-07-16 19:27:05 +07:00

..

Chart.hx

Merge remote-tracking branch 'public/main'

2025-07-06 04:40:21 +02:00

ChartData.hx

Merge remote-tracking branch 'public/main'

2025-07-06 04:40:21 +02:00

EventsData.hx

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

2025-07-16 19:27:05 +07:00

FNFLegacyParser.hx

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

2025-07-16 19:27:05 +07:00

PsychParser.hx

Added some more documentation

2024-12-16 04:37:18 +01:00

VSliceParser.hx

some more stuff SOMEONE HAVE TO TEST THESE 2 COMM

2025-07-06 04:44:46 +02:00