Furo
9bd8ad0ad7
Merge branch 'main' into translations-system
2025-07-21 12:58:53 +02: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
7a8f1f0ded
Update FreeplayState.hx ( #669 )
...
* Update FreeplayState.hx
* should be good
* pretty print the color
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2025-07-05 01:06:57 +02:00
Frakits
9db001101a
[REQUIRES TESTING] removed lowercasing requirement in song parsing
2025-07-01 10:18:46 +03:00
⍚~Nex
f59864d8a4
StoryWeeklist + Week class+ loading weeks fix
...
BIG REWRITE!!
a 2 YEARS OLD commit, are we DEADASS for never noticing the way they loaded😭 🥀
2025-05-08 18:04:42 +02:00
Ne_Eo
f17d8bf072
Merge remote-tracking branch 'upstream/main'
2025-05-02 02:45:57 +02:00
Furo
2f2bad2dc9
Icon Fixes
2025-04-21 20:24:36 +02: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
⍚~Nex
5ab8a02a10
Merge remote-tracking branch 'public/main'
2025-01-03 19:18:18 +01:00
Til and GitHub
f90782d712
make freeplay change bpm so stuff isnt out of sync ( #514 )
2025-01-02 15:07:20 +01:00
Ne_Eo
f50cbdbb80
Fix highscores being deleted
2024-12-19 22:38:38 +01:00
Ne_Eo
d6dc3ea232
Fix typos
2024-12-10 04:35:32 +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
cd0f06f448
Merge remote-tracking branch 'upstream/main'
2024-11-29 22:02:37 +01:00
f6710550c8
allow me to use my mouse scroll wheel in the mod menu (+ more menus) ( #450 )
...
* Update ModSwitchMenu.hx
* fixed
* adding wheel to more menus
* forgor pixel
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-11-24 17:32:40 +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
77b7eebed1
better events and funkinSave categorization
2024-11-15 17:52:19 +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
SrtHero278
834328d2b9
mirgrated to the actual engine and new spritesheet
...
TODO: proper offsetting i dont feel like it right nowwwwwwwwwwwwwwwwwwwwwwwww
2024-11-02 21:35:51 -07:00
Ne_Eo and ⍚~Nex
8e2ffbb920
Made SaveWarning translatable + more
...
Optimized Playstate
Made the songPosInfo translatable
Made UpdateAvailableScreen translatable
Co-Authored-By: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-10-04 21:22:53 +02:00
Ne_Eo
cdfddcde48
Small fixes
2024-10-04 17:57:54 +02:00
Ne_Eo
8ce4c8ab25
Merge branch 'main' into translations-system
2024-09-22 15:21:17 +02:00
Ne_Eo
7442f6ec91
Small Cleanup
2024-09-06 03:45:00 +02:00
Ne_Eo
54b63b87dd
Merge branch 'main' into new-editors
2024-09-03 01:23:08 +02:00
⍚~Nex
32849cfd46
Merge branch 'main' into base-fnf-port-remake
2024-09-01 03:51:58 +02:00
⍚~Nex
cb1d6fcacf
songs/weeks list modes flags
2024-09-01 03:47:41 +02:00
⍚~Nex
500cf98e0c
editable static costants!
...
for scripts :D
2024-08-31 02:31:05 +02:00
Ne_Eo
fe05ae66ce
Merge branch 'main' into translations-system
2024-08-16 17:17:13 +02:00
Ne_Eo
deda73f8a8
Fix bug with autoplay
2024-08-05 18:53:28 +02:00
Ne_Eo
6aaa9e1421
Fix bug with autoplay
2024-08-05 18:52:12 +02:00
Ne_Eo
dbd2219b20
Cleanup + Optimization
2024-08-02 00:42:47 +02:00
NeeEoo
9cf4c903ad
WIP Translation
2024-04-12 14:11:09 +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
Ne_Eo and ⍚~Nex
e068300cf1
Improved Macros + Libraries (WIP)
...
Co-Authored-By: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-04-09 18:32:57 +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
832edd27fc
applying formats and parameters
...
also due to a merge conflict apparently the deathCounter++ was never merged from my original old pr😭
2024-04-05 18:00:38 +02:00
⍚~Nex
9d3f31b7f0
adding more translations
2024-04-02 05:32:46 +02:00
⍚~Nex and Ne_Eo
5eac25a541
softcoded rpc calls
...
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com >
2024-03-23 23:34:52 +01:00
NeeEoo
f8b20774e3
Remove useless indentation
2024-03-16 21:15:18 +01:00
NeeEoo
4a34bb19d7
Cleanup
2024-03-05 17:54:34 +01:00
NeeEoo
1cdb7fe2f6
Fix stuff
2024-03-01 02:43:42 +01:00
Frakist
61c6d88b6a
changed super.create position in freeplaystate
2023-11-10 16:10:57 +02:00
NeeEoo
4985ffbd86
Small fixes
2023-08-12 13:22:28 +02: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