Commit Graph
14 Commits
Author SHA1 Message Date
Ralty f95ac046d6 Whoops! 2025-07-19 01:38:58 +07:00
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 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
7a39947b7f a little charter bugfixs and dont show strumlines locks if there no strumline in the chart (#664)
* dbssdbihsadibjsdainbi

* g

* a little charter fixs

* Update README.md

* ihateyou GitHub

* there

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 02:04:10 +02:00
NeeEooandMihai Alexandru a8997daecb New Mouse Icons for Mac!
Co-Authored-By: Mihai Alexandru <77043862+MAJigsaw77@users.noreply.github.com>
2024-04-15 14:01:04 +02:00
Dirk-DinkumandNe_Eo 5f50b80df7 UIWindow collapsing fix
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-04-13 21:55:44 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
lunarcleint 1fafc96509 FIX DUMB BUG WITH BUTTONS 2024-03-21 13:53:15 -07:00
NeeEoo 16bd618ca8 Forgot to save these files 2024-03-19 00:30:21 +01:00
lunarcleint f446c638c5 QAUNTIZED DRAGGING + some animation changes :D 2024-02-03 22:09:56 -07:00
lunarcleint 7aba3af4ff wait a second... 2024-02-03 20:29:42 -07:00
lunarcleint 5721ce68a0 some new assets (not warnings) 2024-02-03 20:28:45 -07:00
lunarcleint 9c2cffcf4e remove angle tween on hoverer 2023-11-19 15:48:14 -07:00
lunarcleint 357815187f Finish update 2023-09-18 21:21:29 -07:00