Commit Graph
2324 Commits
Author SHA1 Message Date
Frakits 93e23ebc69 I FIXED THIS SHIT!!!!!!!!!!!!!! 2025-07-25 20:00:10 +03:00
Frakits 28b854467d Merge remote-tracking branch 'origin/main' 2025-07-25 18:35:32 +03:00
Frakits 84985b93d4 please check out all of these amazing sound effects of course 2025-07-25 18:35:16 +03:00
Hero 5cff42ccd8 icon support FOR NOW. 2025-07-25 17:51:53 +03:00
Hero a9bc7c5ba9 thank you frakits 2025-07-25 15:28:17 +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
FrakitsandGitHub 59968d9851 nobody told me i wrote this stupid shit 💔 2025-07-25 03:38:33 +03:00
FuroandGitHub 4ed1fbd21f Update Charter.hx 2025-07-25 01:36:07 +02:00
Frakits f57f4590a9 h 2025-07-24 21:26:21 +03:00
Frakits ad8b6a9dad hi can someone test making events i can't use cne anymore 2025-07-24 21:19:40 +03:00
Frakits 848092a37e best of both worlds 2025-07-24 14:41:36 +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
Furo 17f072a40f Stage Editor Translatable 2025-07-23 19:49:43 +02:00
Furo 8565bf280a Character Editor Translatable 2025-07-22 22:59:56 +02:00
Ralty d39691a96e Merge branch 'main' into translations-system 2025-07-23 02:30:16 +07:00
Ralty 4898fd3e60 AAGAJGAJGJ 2025-07-23 02:02:07 +07:00
Ralty 65242ff29c Shitty MeterOption Impl for now 2025-07-23 01:35:09 +07:00
Ralty 64114e9349 frakits help mee 2025-07-22 20:19:16 +07:00
Ralty 400a399cb6 remove STRIPPED_COMPILE, other small small changes 2025-07-22 19:18:53 +07:00
Furo daa7550c35 Finished Charter & Options in Translation File 2025-07-21 19:06:25 +02:00
Ralty 64f8553811 Fix off-centered alphabets in menu somehow 2025-07-21 23:12:48 +07:00
Ralty 304bbe12fd remove macro-fixer that is uhh made by yknoow 2025-07-21 23:08:01 +07:00
Furo 579bff7c44 Fix compiling 2025-07-21 16:16:36 +02:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02:00
Ralty 9f43f96ef7 Fix Misplaced Variable?? 2025-07-20 18:06:05 +07:00
Ralty 9483e5ff3a put it back in 2025-07-20 08:55:55 +07:00
Ralty ec1b0175b0 A little fix, no clue whats going on w .position 2025-07-20 08:11:50 +07:00
Ralty 3b06a3142e Ooohh... 2025-07-20 00:56:18 +07: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 2f5155da42 oh it gets automatically resized 2025-07-20 00:32:03 +07:00
Ralty 31b2f5bcb9 Merge branch 'furo-charter-bookmarks' into new-editors-conductor
# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
2025-07-20 00:24:17 +07:00
Ralty 7c3b31c0be aagh 2025-07-19 23:56:14 +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 f34c274326 IniUtil Section Supports, uh whatever 2025-07-19 22:51:27 +07:00
Ralty 102f80b4e3 here u go frakits 2025-07-19 20:18:42 +07:00
Ralty 0b0b30239e oops 2025-07-19 19:19:25 +07:00
Ralty b1829aa4ad Merge branch 'new-conductor' into new-editors-conductor
# Conflicts:
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterBackdropGroup.hx
#	source/funkin/editors/charter/CharterEvent.hx
2025-07-19 19:17:27 +07:00
Frakits 274aa310c1 oh yeah and i nearly forgot 2025-07-19 14:44:13 +03:00
Frakits ff5606badc Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev 2025-07-19 14:41:00 +03:00
Frakits 6f8330f91b h 2025-07-19 14:40:40 +03:00
RaltyandGitHub 00f3d128af Merge pull request #7 from chronicsilly/patch-2
Clean the xml more
2025-07-19 14:45:18 +07:00
RaltyandGitHub 5cc10b2656 Merge pull request #8 from chronicsilly/patch-3
prettyprint option on stage xmls
2025-07-19 14:34:20 +07:00
Ralty 8259266f44 Small fixes 2025-07-19 14:10:54 +07:00
Ralty 431928685d Merge remote-tracking branch 'upstream/main' into new-editors-main 2025-07-19 01:41:27 +07:00
Ralty f95ac046d6 Whoops! 2025-07-19 01:38:58 +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