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
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
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
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
⍚~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
TheZoroForce240
30a84774a8
Merge branch 'new-editors' into zoro-charterstuffs
2024-09-12 21:14:06 +01: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
96e1ae4e8a
Merge remote-tracking branch 'upstream/main'
2024-07-06 02:10:33 +02:00
⍚~Nex
6715e2b1cc
even cooler stuff for file attributes
2024-06-18 04:54:59 +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
d17ea72c74
Organize Imports and remove unused Imports
2024-04-11 14:23:02 +02:00
⍚~Nex
ef2891bbe6
bye april fools 😭
...
man that was buggy af
2024-04-02 23:50:59 +02:00
lunarcleint
014be749e6
Squashed commit of the following:
...
commit 4987983dc6e655183b34258fed905be2fba73e0a
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com >
Date: Mon Apr 1 06:32:22 2024 -0700
fix charter bug
commit 1135b53d4d4ab48fb74a9d5693579d0a2e4923db
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com >
Date: Mon Apr 1 00:46:53 2024 -0700
small changes
commit 102931f3511c9f0423cf887ebf91eaeeb1024abe
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com >
Date: Sun Mar 31 23:03:03 2024 -0700
update spelling mistakes
commit 87ad53ae91bc8b4d3b49af3ebb8c07db9f13765b
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com >
Date: Sun Mar 31 22:40:48 2024 -0700
Chart editor updates
commit 8f7cae8a80a681158ff125c3e2547c9fd4dee7c1
Author: NeeEoo <NeeEoo@users.noreply.github.com >
Date: Mon Apr 1 07:03:30 2024 +0200
Redesigned Chart Editor
commit dbb94ba3bd8455a91883d6e5b59b25da87aefa32
Author: NeeEoo <NeeEoo@users.noreply.github.com >
Date: Mon Apr 1 02:20:57 2024 +0200
Added Stage Editor
2024-04-01 06:44:28 -07:00
NeeEoo
8db8aca565
Fixed discord script
2024-03-24 00:01:36 +01:00
⍚~Nex
72db6e1a6e
removed that goddamn terminal opening at the start
2024-03-18 00:35:58 +01:00
NeeEoo
f8b20774e3
Remove useless indentation
2024-03-16 21:15:18 +01:00
Frakist
2eed5a0aa3
priority addons
2023-11-01 18:35:23 +03:00
NeeEoo
a620c0ceed
Added library redirecting + Addons fixes
2023-10-12 12:22:05 +02:00
lunarcleint
d5d8ef2564
move events data to funkin.backend.chart
2023-07-30 14:24:48 -07:00
23648695e9
More Optimizations ( #188 )
...
* bye
* Updated docs
* Adding docs to gitignore
Useless to keep and upload too plus it contains sensitive stuff that takes when generating docs (eg: repo's saved path)
It's prob smth that the docs program uses temporarily to generate
* Re-exported gf chrimah
Atlas exported christmas gf by @EnderNile8182
Gf adjusted offsets by me
No more black lines
Co-Authored-By: Nile <102095746+endernile8182@users.noreply.github.com >
* Custom Credits
* Better Custom Credits
* Custom Credits template
* Re-exported gf car
Atlas exported car gf by @EnderNile8182
I've edited some strings in the xml
No more black lines
Co-Authored-By: Nile <102095746+endernile8182@users.noreply.github.com >
* Re-exported gf tank
Atlas exported tank gf by @EnderNile8182
Gf adjusted offsets by me
No more black lines
Co-Authored-By: Nile <102095746+endernile8182@users.noreply.github.com >
* Yay finished gfs
* Better Icons
Mainly Fixed offsets and adjust Tankman ones (some transparent pixels)
* Added bf x gf week 7 gameover
* verbose!!!!!!!!!!
❗
* tank bg "bug" fix
it was also giving an error
what the hell is tankBg even
* No more game freeze for desktop on freeplay
* Some freeplay optimisations
* Making .temp folder hidden
idk i found it ugly
* Reupdated docs
---------
Co-authored-by: Nile <102095746+endernile8182@users.noreply.github.com >
2023-07-19 15:48:20 -07:00
lunarcleint
0b1166f2cc
cant keep on doing this shit 😭
2023-06-30 23:08:11 -07:00
lunarcleint
b8643ad1f7
New add strumline button + editing + other charter bug fixes
2023-06-30 23:05:51 -07:00
lunarcleint
e060ee3ddb
wait
2023-05-28 16:15:04 -07:00
lunarcleint
54a3d29a23
Edit Metadata WIP Menu
2023-05-28 16:14:06 -07:00
InkyBox
75f6bec829
Rerevert Commit Fuck You
2023-05-22 13:47:07 -05:00
InkyBox
4aa95838d7
Revert Commit Fuck You
2023-05-22 13:36:05 -05:00
lunarcleint
59a7f95507
Scriptable Events (pls test)
2023-05-21 20:58:35 -07:00
Yoshman29
06828cade7
time to break your mods again for ease of use
2023-04-18 02:13:04 +02:00