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

..

character

Merge remote-tracking branch 'upstream/main'

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

charter

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

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

extra

i take it back shadowmario is not real sorry shadowmario

2024-02-02 17:07:29 +02:00

ui

more progress + psych/legacy importer

2025-04-05 03:38:36 +02:00

DebugOptions.hx

Fix typos

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

EditorPicker.hx

Added some more flags

2025-01-24 01:51:25 +01:00

EditorTreeMenu.hx

Merge remote-tracking branch 'public/main'

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

import.hx

Organize Imports and remove unused Imports

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

SaveSubstate.hx

bugfix for loading deleted mods + safe saves

2024-03-17 18:00:18 +01:00

SaveWarning.hx

HTML5 stuff

2025-03-16 03:52:18 +01:00

UIDebugState.hx

Organize Imports and remove unused Imports

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

UndoList.hx

unsaved shit in the chart editor wip

2023-08-23 19:33:51 -07:00