Commit Graph
13 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
Yoshman29 5609f18c6a Fixes for Linux systems 2025-05-11 11:15:22 +02:00
Ne_Eo fdf53b3d4f Merge branch 'main' into new-editors 2025-01-09 20:05:06 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +01:00
Ne_Eo 17ce1f147c Merge branch 'main' into new-editors 2024-09-14 23:49:06 +02:00
Ne_Eo fd451127c0 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	source/funkin/backend/system/framerate/CodenameBuildField.hx
2024-09-07 10:33:00 +02:00
⍚~Nex e2c79bea7d @usb-port-2 im gonna throw you off a cliff
before i fucking murder you
2024-09-07 04:26:12 +02:00
Ne_Eo 4a755345a6 Merge branch 'main' into new-editors 2024-09-01 02:33:38 +02:00
Ne_Eo f8d1cf08ad Added runtime feature flags 2024-09-01 02:31:51 +02:00
Ne_Eo dbd2219b20 Cleanup + Optimization 2024-08-02 00:42:47 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo 2263e60a6f Fix crash on mobile 2023-08-11 10:26:57 +02:00
Yoshman29 06828cade7 time to break your mods again for ease of use 2023-04-18 02:13:04 +02:00