Commit Graph
15 Commits
Author SHA1 Message Date
Ralty ef6cdd5371 Options Rewrite WIP Appearance Restructure 2025-07-26 18:53:25 +07:00
Ralty f20fc25a82 Options Rewrite WIP not functional yet 2025-07-26 16:21:53 +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 e6766cdcd7 dev mode implementation 2025-07-07 01:53:02 +02:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
07ae6b643c FINALLY fixed the issue with GlobalState blowing up when pressing F5. (#666)
* peak is happening

<r>RED<r>

* oops

* oops x2

forgot I left a trace when loading up global.hx from `Assets` lol

* **State / SubState reloading broken rn but pushing changes to see if anyone can fix**

* Human... I remember you
<r>disabling reloading substates cuz it broke...<r>

* <y>forgor to edit assets global.hx<y>

* lemme see

* kk

* opa

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 01:46:42 +02:00
TheZoroForce240 ba129a9c8c custom controls stuff 2024-08-29 19:48:22 +01:00
Ne_Eo c1123b9e3c Controls Macro! 2024-07-09 11:24:07 +02:00
⍚~Nex 42b182b144 Merge remote-tracking branch 'master/main' 2024-06-01 00:44:14 +02:00
1ac2e7f533 Made main menu shows the current keybind key for opening mods select menu (#271)
* Update Controls.hx

* done

* fixin a smol typo

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-05-31 18:08:23 +02:00
NeeEoo 59164cbb1d Cleanup 2024-04-12 12:38:36 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo c8ef7ef967 Cleanup 2024-04-09 13:33:55 +02:00
Frakist 140cdfc6bd made Controls.hx significantly longer lol 2024-01-05 11:14:20 +02:00
Yoshman29 06828cade7 time to break your mods again for ease of use 2023-04-18 02:13:04 +02:00