Ralty b1829aa4ad Merge branch 'new-conductor' into new-editors-conductor ...

# Conflicts:
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterBackdropGroup.hx
#	source/funkin/editors/charter/CharterEvent.hx

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

..

cutscenes

some cutscene stuff

2025-07-06 17:50:15 +02:00

Character.hx

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

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

GameOverSubstate.hx

Merge remote-tracking branch 'upstream/main'

2025-04-10 02:24:58 +02:00

HealthIcon.hx

Merge remote-tracking branch 'public/main'

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

HudCamera.hx

Added some more documentation

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

Note.hx

Merge remote-tracking branch 'public/main'

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

NoteGroup.hx

Merge branch 'main' into new-editors

2025-01-09 20:05:06 +01:00

PlayState.hx

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

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

Splash.hx

wanrning 😭 (#656)

2025-06-21 13:44:55 +02:00

SplashGroup.hx

Small fixes

2025-07-19 14:10:54 +07:00

SplashHandler.hx

Merge remote-tracking branch 'public/main'

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

Stage.hx

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

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

Strum.hx

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

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

StrumLine.hx

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

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