Commit Graph
14 Commits
Author SHA1 Message Date
Ralty 52184f0470 Merge remote-tracking branch 'upstream/main' into new-editors-main
# Conflicts:
# commandline/commands/Compiler.hx
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/MusicBeatState.hx
# source/funkin/backend/MusicBeatSubstate.hx
# source/funkin/backend/chart/Chart.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/scripting/GlobalScript.hx
# source/funkin/backend/system/Controls.hx
# source/funkin/backend/system/MainState.hx
# source/funkin/backend/utils/AudioAnalyzer.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/character/CharacterInfoScreen.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterSelection.hx
# source/funkin/editors/charter/CharterStrumline.hx
# source/funkin/editors/charter/CharterStrumlineButton.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/editors/ui/UIDropDown.hx
# source/funkin/editors/ui/UIFileExplorer.hx
# source/funkin/game/Note.hx
# source/funkin/game/PlayState.hx
# source/funkin/game/SplashGroup.hx
# source/funkin/game/Stage.hx
# source/funkin/game/Strum.hx
# source/funkin/menus/FreeplayState.hx
# source/funkin/options/Options.hx
# source/funkin/options/keybinds/KeybindsOptions.hx
2025-07-19 00:57:08 +07:00
⍚~Nex 226c7f84a6 more progress + psych/legacy importer 2025-04-05 03:38:36 +02:00
Furo d67f537cdf added vslice fnfc format (psych import soon) 2025-03-29 16:43:22 +01:00
lunarcleint 1d86fe00b5 bleh >:P 2025-02-24 17:20:26 -07:00
lunarcleint 117c3a2dab image uploader 2025-01-14 17:37:21 -07:00
Ne_Eo 5801ed0840 Merge branch 'main' into new-editors 2024-10-18 03:02:13 +02:00
Ne_Eo 2bfc58ccb0 Some optimizations
I wish there was a cleaner way of doing this
2024-10-18 02:50:41 +02:00
Ne_Eo 0319dad155 Drop down button + Optimization 2024-08-02 02:28:33 +02:00
Frakist bc30119934 to be polished 2024-01-31 21:44:16 +02:00
⍚~Nex be3ffd6e4f possibility to undo and redo note type changes yay 2024-01-05 03:26:55 +01:00
lunarcleint 0dfd021a46 hi 2023-08-15 18:05:01 -07:00
lunarcleint 6d7834ec09 changes 2023-08-14 19:22:55 -07:00
lunarcleint 7d993189ca ui sound player functional 2023-08-13 19:18:20 -07:00
lunarcleint 4e69ea9fc8 WIP audio shit 2023-08-12 16:28:14 -07:00