Commit Graph
362 Commits
Author SHA1 Message Date
Frakits 84985b93d4 please check out all of these amazing sound effects of course 2025-07-25 18:35:16 +03:00
Frakits 07bc9f669b more mod metadata stuff 2025-07-25 15:24:44 +03:00
Frakits e46f11ff80 dude... 2025-07-25 14:36:40 +03:00
Frakits be45076b13 they get marked so.. 2025-07-25 14:34:53 +03:00
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
Ralty 64f8553811 Fix off-centered alphabets in menu somehow 2025-07-21 23:12:48 +07:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02:00
Ralty 1baca2e941 Merge branch 'raltyro-audio-rewrite'
# Conflicts:
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/system/modules/AudioSwitchFix.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/options/Options.hx
2025-07-20 00:36:31 +07: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 b64f4612b9 Merge branch 'main' into raltyro-audio-rewrite
# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
2025-07-19 23:36:06 +07:00
Ralty 102f80b4e3 here u go frakits 2025-07-19 20:18:42 +07:00
Frakits 6f8330f91b h 2025-07-19 14:40:40 +03: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
Ralty 6cb90a66c9 FlxSound & internal rewrite & Streamed Music 2025-07-10 15:37:35 +07:00
⍚~Nex e6766cdcd7 dev mode implementation 2025-07-07 01:53:02 +02:00
⍚~Nex 1b0ad7d3a6 some more stuff SOMEONE HAVE TO TEST THESE 2 COMM 2025-07-06 04:44:46 +02:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
6f7c3a4278 Options/Credits from multiple asset libraries + Fix options transition when exiting Controls (#367)
* load all options from all asset libraries

* add override for options

* removing overridedMods

* fixing the options transin not appearing

when exiting keybinds substate

* making it for credits too

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-06 00:14:34 +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
Chronic x3andGitHub 26cc14f834 this has NOT been annoying me for ages (#649) 2025-06-16 13:49:48 +03:00
Furo a990da0849 Fix Version Being Null + Fixed Icon Transitions Offset 2025-06-04 15:59:02 +02:00
FrakitsandGitHub f048942bcc i fucking hate this dude holy shit 2025-06-04 16:02:09 +03:00
FrakitsandGitHub 2992e01069 ts pmo icl 2025-06-04 15:52:45 +03:00
⍚~Nex fcfc7950a1 making the endingSong bool actually work
that variable has been there for 3 years btw😭
2025-05-11 02:26:11 +02: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
⍚~Nex 0f09306a44 normal vslice SUPPORT 2025-04-01 01:36:23 +02:00
Ne_Eo 531f8b7882 HTML5 stuff 2025-03-16 03:52:18 +01:00
Ne_Eo 1815c9d0c0 Merge branch 'main' into translations-system 2025-02-28 16:49:28 +01:00
Ne_Eo 69a17d5fef Merge branch 'main' into new-editors 2025-02-28 16:39:06 +01:00
Ne_Eo 3851ede84d Merge remote-tracking branch 'upstream/main' 2025-02-28 16:38:04 +01:00
SrtHero278 aacf88ce45 hi guys (component editing)
possibly some messy code but oh boy
2025-02-26 21:02:29 -08:00
8196103b30 Make the level info text in PauseSubState accessible to scripts (#549)
* Update PauseSubState.hx

* making them funkin text and organizing imports

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-02-09 21:44:30 +01:00
⍚~Nex a06128472c after ages VERBOSE MODE 2025-02-06 23:23:26 +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 5f51df0f3f Merge branch 'main' into new-editors 2025-01-22 22:25:21 +01:00
Ne_Eo f6891dda52 Work on alphabet editor 2025-01-19 18:14:17 +01:00
Ne_Eo fd2d44dc80 Merge branch 'main' into translations-system 2025-01-17 15:32:42 +01:00
Ne_Eo 108b385e6c Merge remote-tracking branch 'upstream/main' 2025-01-17 15:23:44 +01:00
Ne_Eo 1facc82073 Fix credits menu bg not being able to be animated 2025-01-10 16:22:32 +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
⍚~Nex 5ab8a02a10 Merge remote-tracking branch 'public/main' 2025-01-03 19:18:18 +01:00
TilandGitHub f90782d712 make freeplay change bpm so stuff isnt out of sync (#514) 2025-01-02 15:07:20 +01:00
Ne_Eo d057d11f5f Small fix! 2024-12-24 22:02:56 +01:00
SrtHero278 c9e47516f3 a few more chars and alphabet errors 2024-12-24 10:48:24 -08:00