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
Ne_Eo
fdf53b3d4f
Merge branch 'main' into new-editors
2025-01-09 20:05:06 +01:00
Ne_Eo
aec73ab2b6
Added some more documentation
2024-12-16 04:37:18 +01:00
Ne_Eo
d6dc3ea232
Fix typos
2024-12-10 04:35:32 +01:00
Ne_Eo
204a151170
Merge branch 'main' into new-editors
2024-11-15 18:50:48 +01:00
⍚~Nex
d31454c7dd
substate auto custom transitions!!
2024-10-21 17:57:47 +02:00
⍚~Nex
4c94bb61a7
Merge branch 'main' into base-fnf-port-remake
2024-10-21 17:50:30 +02: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
⍚~Nex
8e81d17fb0
continuinggg (very cool improvements)
...
asynced video loadings, classes rewrites, bugfixes and a lot more
2024-08-31 04:37:00 +02:00
Ne_Eo
b31561eb43
Removed reloading
2024-07-21 23:19:39 +02:00
NeeEoo
d17ea72c74
Organize Imports and remove unused Imports
2024-04-11 14:23:02 +02:00
NeeEoo
4a34bb19d7
Cleanup
2024-03-05 17:54:34 +01:00
NeeEoo
2da4b8a111
Better errors
2024-02-12 11:55:36 +01:00
⍚~Nex
cc23e4c24f
bye onDestroy
...
from lunar suggestion since it was confusing as fuckkk😭
2024-02-03 03:37:48 +01:00
NeeEoo
150ae69d57
Oops
2023-10-14 14:36:05 +02:00
NeeEoo
7ec91e908c
heck
2023-10-14 14:34:26 +02:00
Frakist
e49b0653e3
oops #2
2023-10-14 08:48:43 +03:00
Frakist
9992490d14
[BREAKING i think] state scriptpacks
2023-10-13 20:57:46 +03:00
CharlesCatYT and GitHub
8a2ac9e1d4
attempt undo ( #193 )
2023-07-20 20:50:37 -07:00
NeeEoo
1259449f84
Fixed source assets, I hate this code so much please fix later
...
Fixed naming convention
2023-07-19 15:38:50 +02:00
lunarcleint
9ffff13ce8
ok should be fixed now
2023-07-18 18:04:23 -07:00
2114be6fc6
replace single scripts with scriptpacks ( #185 )
...
* replace single scripts with scriptpack
* this might break a ton of mods i think
* oops
* stuff
---------
Co-authored-by: Frakist <90983918+Frakist@users.noreply.github.com >
2023-07-18 04:25:37 -07:00
Yoshman29
06828cade7
time to break your mods again for ease of use
2023-04-18 02:13:04 +02:00
Ralty