Ralty 31b2f5bcb9 Merge branch 'furo-charter-bookmarks' into new-editors-conductor ...

# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx

2025-07-20 00:24:17 +07:00

..

assets

Merge remote-tracking branch 'upstream/main' into new-editors-main

2025-07-19 00:57:08 +07:00

chart

Merge branch 'furo-charter-bookmarks' into new-editors-conductor

2025-07-20 00:24:17 +07:00

scripting

Merge remote-tracking branch 'upstream/main' into new-editors-main

2025-07-19 00:57:08 +07:00

shaders

Merge remote-tracking branch 'upstream/main'

2025-05-02 02:45:57 +02:00

system

Merge branch 'main' into new-editors-conductor

2025-07-19 23:51:52 +07:00

utils

Merge branch 'furo-charter-bookmarks' into new-editors-conductor

2025-07-20 00:24:17 +07:00

week

some more stuff SOMEONE HAVE TO TEST THESE 2 COMM

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

FlxAnimate.hx

Merge remote-tracking branch 'public/main'

2025-01-03 19:18:18 +01:00

FunkinSprite.hx

Merge branch 'new-conductor' into new-editors-conductor

2025-07-19 19:17:27 +07:00

FunkinText.hx

Organize Imports and remove unused Imports

2024-04-11 14:23:02 +02:00

MusicBeatGroup.hx

Added some more documentation

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

MusicBeatState.hx

Merge remote-tracking branch 'upstream/main' into new-editors-main

2025-07-19 00:57:08 +07:00

MusicBeatSubstate.hx

Merge remote-tracking branch 'upstream/main' into new-editors-main

2025-07-19 00:57:08 +07:00

MusicBeatTransition.hx

finished global/local events + HUGE SAVES FIX

2025-03-09 06:11:36 +01:00