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

..

data

some more stuff SOMEONE HAVE TO TEST THESE 2 COMM

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

fonts

Made the time signature event icon dynamic

2024-10-12 23:06:55 +02:00

images

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

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

music

hell, here we are again

2024-08-27 17:46:44 +02:00

shaders

Fix typos

2024-12-10 04:35:32 +01:00

songs

FINALLY fixed the issue with GlobalState blowing up when pressing F5. (#666)

2025-07-05 01:46:42 +02:00

sounds

dialogues stuff & porting WIP 4

2024-02-19 02:34:58 +01:00

videos

why are these even here, BEGONE❗❗

2024-08-27 03:33:49 +02:00