Frakits
6b5885ca74
shit
2025-07-24 13:57:06 +03:00
Frakits
e8332c688f
readd the beta warning state as a template state (WarningState.hx)
2025-07-24 13:51:58 +03:00
Furo
9bd8ad0ad7
Merge branch 'main' into translations-system
2025-07-21 12:58:53 +02:00
Ralty
2843d8a3a3
Merge branch 'main' into new-editors-conductor
...
# Conflicts:
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/backend/utils/IniUtil.hx
# source/funkin/editors/character/CharacterEditor.hx
# source/funkin/editors/ui/UIWarningSubstate.hx
2025-07-19 23:51:52 +07:00
Ralty
102f80b4e3
here u go frakits
2025-07-19 20:18:42 +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
Ne_Eo
31042a9039
Allow addons in mods folder
...
This allows people to add addons using `mods/<mymod>/addons/<myaddon>/`
2025-05-16 01:00:22 +02:00
Ne_Eo
1815c9d0c0
Merge branch 'main' into translations-system
2025-02-28 16:49:28 +01:00
Ne_Eo
023e7753b2
Merge branch 'main' into new-editors
2025-02-06 21:22:45 +01:00
Ne_Eo
cbbb598f52
Added some more flags
2025-01-24 01:51:25 +01:00
Ne_Eo
f6891dda52
Work on alphabet editor
2025-01-19 18:14:17 +01:00
Ne_Eo
fe0542a32c
Merge branch 'main' into translations-system
2025-01-09 20:26:29 +01:00
Ne_Eo
fdf53b3d4f
Merge branch 'main' into new-editors
2025-01-09 20:05:06 +01:00
Ne_Eo
fd0c188577
Added some flags for Transition/Pause/Gameover
2024-12-16 03:21:04 +01:00
Ne_Eo
a20020bc3c
Merge remote-tracking branch 'upstream/main'
2024-12-16 03:13:23 +01:00
e2a3951702
Transition crash fix again + changeable transition script ( #493 )
...
* fix transition crash when skipping
* transition crash fix again
* rename transition script var
* better transition scripting
* add more transition script functions
* move post create to actually be after
* change this
* actually destroy the script
* add a variable to disable skipping the transition
* opa
idk felt better like this
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-12-14 16:48:58 +01:00
Ne_Eo
80ef390095
Merge branch 'main' into translations-system
2024-11-29 22:06:37 +01:00
Ne_Eo
0d357171cf
Merge branch 'main' into new-editors
2024-11-29 22:05:11 +01:00
Ne_Eo
90a8c2711c
Change URL on Wiki + Added some flags
2024-11-29 21:44:03 +01:00
Ne_Eo
204a151170
Merge branch 'main' into new-editors
2024-11-15 18:50:48 +01:00
Ne_Eo
5f16024b3e
Merge branch 'main' into translations-system
2024-11-15 18:13:04 +01:00
⍚~Nex and Ne_Eo
596cb850cc
What? Constants is evolving into Flags!
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-11-15 13:58:35 +01:00
Ne_Eo
a36fc62c0a
More work on alphabet editor
2024-11-03 23:59:52 +01:00
⍚~Nex and Ne_Eo
69a2f9f953
2 men,1 pregnant WIP 1
...
we're so back
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-10-03 01:12:49 +02:00
Ne_Eo
8ce4c8ab25
Merge branch 'main' into translations-system
2024-09-22 15:21:17 +02:00
TheZoroForce240
30a84774a8
Merge branch 'new-editors' into zoro-charterstuffs
2024-09-12 21:14:06 +01:00
SrtHero278
d9ac738a61
language specific data and TypeEffect!
2024-09-08 17:42:14 -07:00
⍚~Nex
32849cfd46
Merge branch 'main' into base-fnf-port-remake
2024-09-01 03:51:58 +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
⍚~Nex
8e81d17fb0
continuinggg (very cool improvements)
...
asynced video loadings, classes rewrites, bugfixes and a lot more
2024-08-31 04:37:00 +02:00
⍚~Nex and Ne_Eo
562f1d8fc6
constants macros: reset(), init() and @:lazy
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-08-31 03:08:13 +02:00
TheZoroForce240
ba129a9c8c
custom controls stuff
2024-08-29 19:48:22 +01:00
Ne_Eo
dbd2219b20
Cleanup + Optimization
2024-08-02 00:42:47 +02:00
Ne_Eo
a793aab503
Merge branch 'main' into translations-system
2024-07-18 22:06:47 +02:00
Ne_Eo
96e1ae4e8a
Merge remote-tracking branch 'upstream/main'
2024-07-06 02:10:33 +02:00
SrtHero278
144aed7c81
new alphabet in progress!
2024-06-19 16:41:23 -07:00
⍚~Nex
6715e2b1cc
even cooler stuff for file attributes
2024-06-18 04:54:59 +02:00
⍚~Nex
3683a54298
Merge branch 'main' into translations-system
2024-06-09 01:38:14 +02:00
⍚~Nex
e7ddb10c64
Merge remote-tracking branch 'master/main'
2024-06-09 01:27:43 +02:00
⍚~Nex
8d0a38419d
resolved the attrib +h crash in a cool way B)
...
okay this was very funny to add
2024-06-07 17:45:04 +02:00
NeeEoo
070db1c2bd
Merge branch 'main' into translations-system
2024-04-11 14:30:58 +02:00
NeeEoo
d17ea72c74
Organize Imports and remove unused Imports
2024-04-11 14:23:02 +02:00
NeeEoo
244fddc3c7
Made the code work + Cleaned up Code
2024-04-10 18:57:18 +02:00
NeeEoo
d955e00ece
Cleaned up Warning And Error Code
2024-04-10 16:37:19 +02:00
⍚~Nex and Ne_Eo
f9c74c5a2d
OKAY IT HALF WORKS
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-04-09 17:18:29 +02:00
⍚~Nex
1981e29dc2
this should be better (still a wip)
...
i'll brb later to continue
2024-04-07 16:58:29 +02:00
⍚~Nex and Ne_Eo
df5fa1f4ca
more stuff
...
we do be smokin weed
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-04-05 19:24:57 +02:00
⍚~Nex
ef2891bbe6
bye april fools 😭
...
man that was buggy af
2024-04-02 23:50:59 +02:00
Frakits