Commit Graph
83 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
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02: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
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 e4be3bd427 Merge branch 'Time-Signature-Changes' into new-conductor
# Conflicts:
#	.gitignore
#	source/funkin/backend/FunkinSprite.hx
#	source/funkin/backend/chart/ChartData.hx
#	source/funkin/backend/chart/EventsData.hx
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterEvent.hx
#	source/funkin/editors/charter/CharterEventScreen.hx
#	source/funkin/editors/charter/CharterMetaDataScreen.hx
#	source/funkin/editors/charter/SongCreationScreen.hx
#	source/funkin/game/PlayState.hx
2025-07-16 19:27:05 +07:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
Ralty 241b87ad58 Change event params a bit and fix cam zooming 2025-06-30 10:49:38 +07:00
FuroandGitHub 0ee90abe98 Fix wmic (#642) 2025-06-04 16:21:28 +02:00
FrakitsandGitHub 2d76ba4e98 get ready for these powers 2025-06-04 15:03:25 +03:00
Ne_Eo c6c870270f Small HTML5 Fixes 2025-05-16 01:03:53 +02:00
Yoshman29 5609f18c6a Fixes for Linux systems 2025-05-11 11:15:22 +02:00
lunarcleint ccd1515040 acuttaly pmo >:( 2025-04-25 23:22:11 -07:00
lunarcleint 4ab77a4eb6 getSizeString64 2025-03-26 14:37:24 -07:00
lunarcleint 0412203015 fix vram in system info 2025-03-26 14:23:22 -07: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 0a1517df6b Fix framerate counter when using timescale 2025-02-08 01:24:55 +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 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 d6dc3ea232 Fix typos 2024-12-10 04:35:32 +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
Ne_Eo 625b03eee4 Merge branch 'main' into base-fnf-port-remake 2024-11-15 14:13:05 +01:00
⍚~NexandNe_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 2f71bf4426 Merge branch 'main' into translations-system 2024-11-09 01:05:26 +01:00
Ne_Eo 2fc32231ab Merge remote-tracking branch 'upstream/main' 2024-11-09 01:00:11 +01:00
Ne_Eo 3de3c3f828 Allow tweening arrays and shaders
Ignore the contents of this, its just to make it redownload flixel
2024-11-08 18:04:05 +01:00
⍚~Nex 4c94bb61a7 Merge branch 'main' into base-fnf-port-remake 2024-10-21 17:50:30 +02:00
Ne_Eo 6636bffc42 Merge branch 'main' into translations-system 2024-10-18 03:05:11 +02:00
Ne_Eo 5801ed0840 Merge branch 'main' into new-editors 2024-10-18 03:02:13 +02:00
Ne_Eo 2bfc58ccb0 Some optimizations
I wish there was a cleaner way of doing this
2024-10-18 02:50:41 +02:00
Ne_Eo 9febce79c1 Fix hierarchy of libs + Cleaner Tree Info 2024-10-02 22:24:35 +02:00
Ne_Eo 8ce4c8ab25 Merge branch 'main' into translations-system 2024-09-22 15:21:17 +02:00
Ne_Eo 17ce1f147c Merge branch 'main' into new-editors 2024-09-14 23:49:06 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
Ne_Eo fd451127c0 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	source/funkin/backend/system/framerate/CodenameBuildField.hx
2024-09-07 10:33:00 +02:00
⍚~Nex e2c79bea7d @usb-port-2 im gonna throw you off a cliff
before i fucking murder you
2024-09-07 04:26:12 +02:00
dix-nutzandGitHub d9968a8a87 disable framerate text selection (#377)
* Update FramerateCategory.hx

* Update MemoryCounter.hx

* Update FramerateCounter.hx

* Update CodenameBuildField.hx
2024-09-06 14:35:04 +02:00
Ne_Eo 54b63b87dd Merge branch 'main' into new-editors 2024-09-03 01:23:08 +02:00
⍚~Nex aa22bd6e1d fixing stuff 2024-09-02 23:47:11 +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
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 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02: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