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

..

characters

Trim + Optimize images

2025-05-07 14:48:40 +02:00

credits

Trim + Optimize images

2025-05-07 14:48:40 +02:00

dialogue

Trim + Optimize images

2025-05-07 14:48:40 +02:00

editors

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

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

game

Trim + Optimize images

2025-05-07 14:48:40 +02:00

icons

Trim + Optimize images

2025-05-07 14:48:40 +02:00

menus

Merge remote-tracking branch 'upstream/main'

2025-05-07 15:47:35 +02:00

stages

Trim + Optimize images

2025-05-07 14:48:40 +02:00