Commit Graph
75 Commits
Author SHA1 Message Date
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 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 96d60cfe8c Streamed Vocals? 2025-07-12 02:34:55 +07:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
RaltyandGitHub e4baf51e06 Fix Inconsistency in Sustain Input (#663)
Make player sustains the same as cpu sustains
2025-07-02 11:40:56 -04:00
Ne_Eo 13033b2675 Merge remote-tracking branch 'upstream/main' 2025-04-10 02:24:58 +02:00
⍚~Nex 2474575eea strums are now easily changeable 2025-02-22 19:47:45 +01:00
Ne_Eo 5f51df0f3f Merge branch 'main' into new-editors 2025-01-22 22:25:21 +01:00
Ne_Eo 108b385e6c Merge remote-tracking branch 'upstream/main' 2025-01-17 15:23:44 +01:00
Ne_Eo fdf53b3d4f Merge branch 'main' into new-editors 2025-01-09 20:05:06 +01:00
1f224bef22 Fixed a bug where notes (NoteGroup) were not destroyed when StrumLine was destroyed. (#519)
* Fixed a bug where notes (NoteGroup) were not destroyed when StrumLine was destroyed.

* using destroyutil

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-01-04 21:23:34 +01:00
Ne_Eo aec73ab2b6 Added some more documentation 2024-12-16 04:37:18 +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
⍚~Nex 77b7eebed1 better events and funkinSave categorization 2024-11-15 17:52:19 +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
⍚~Nex 4c94bb61a7 Merge branch 'main' into base-fnf-port-remake 2024-10-21 17:50:30 +02:00
Ne_Eo 5801ed0840 Merge branch 'main' into new-editors 2024-10-18 03:02:13 +02:00
Ne_Eo 9640c3e17e Merge remote-tracking branch 'upstream/main' 2024-10-18 02:53:24 +02:00
TheZoroForce240 dcbf9d74ad Merge branch 'new-editors' into zoro-charterstuffs 2024-10-14 22:06:43 +01:00
Ne_Eo 620650bb81 Allow introLength = 0 2024-10-07 00:59:54 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
TheZoroForce240 30a84774a8 Merge branch 'new-editors' into zoro-charterstuffs 2024-09-12 21:14:06 +01:00
⍚~Nex 097aae86e1 needs to be fixes later 2024-09-06 14:50:07 +02:00
Ne_Eo 623ac09950 Better limit 2024-09-04 12:25:19 +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 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
TheZoroForce240 fc5c57f731 offset strum y to center and adjust fade tween to match keycount 2024-08-28 21:57:48 +01:00
TheZoroForce240 c6af3690fb note spacing option + reworked positioning 2024-08-28 19:49:10 +01:00
TheZoroForce240 da18a1a570 Merge branch 'new-editors' into zoro-charterstuffs 2024-08-25 14:49:21 +01:00
Ne_Eo e51439b53e Small optimizations + Automatic Note Limit 2024-08-20 02:35:51 +02:00
Frakits 8a7917fce2 make my life easier 2024-08-03 16:50:30 +03:00
TheZoroForce240andNe_Eo 00dde96956 ported over charter multikey and other stuff
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-08-03 14:34:01 +01:00
⍚~Nex 42b182b144 Merge remote-tracking branch 'master/main' 2024-06-01 00:44:14 +02:00
Rodney, An Imaginative PersonandGitHub 71b7daabbf Fixed typo. (#270)
* Fixed typo.

* Update Assets.hx
2024-05-31 17:19:11 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo 3c03ffce2c Optimization to updateNote 2024-02-26 10:53:29 +01:00
lunarcleint d0ace2c171 note.avoid works 2024-02-04 14:56:25 -07:00
lunarcleint 9cdfaeb39c Merge remote-tracking branch 'upstream/main' 2024-02-04 00:58:19 -07:00
⍚~NexandGitHub a71a02ea94 Asynced credits and more (#223)
* let me cook

* shut up

* offline part but cached bitmaps wont work raaaaaah

* bitch it works

* github node in credits.xml and more

have to finish the no api method

* non api method working

im baaack, ive been kinda busy these days

* balls

* done ig

* non api method first

* less tries

* forgor to update the non github part
2024-02-04 00:52:05 -07:00
NeeEoo c050ea73ce Small optimizations 2023-12-01 02:57:17 +01:00
Frakist 398b61a824 half of multiple vocals support 2023-11-03 00:39:07 +03:00
NeeEoo 964e2ad55b Rewrote Anim Suffix system 2023-08-14 16:53:52 +02:00
NeeEoo d17243b102 Cleanup + Fixes 2023-07-27 11:37:18 +02:00
NeeEoo 1cc7214e01 Fix holds 2023-07-21 18:21:24 +02:00
NeeEoo e9db14487d Huge optimization 2023-07-21 16:28:40 +02:00
NeeEoo 3daab89d13 Note Miss Event + Bug Fix 2023-07-10 00:17:21 +02:00
bctixandGitHub 5f67bd99d2 Added window to edit chart data, and added Scrollspeed to each StrumLine in chart data (#176)
* edit chart data, and per strumline scrollspeed

* forgot to delete a few things uh

* almost forgor this

* Change strum speed back to charts when disabled

* value instead of label

* set max scroll speed to 10
2023-07-05 13:41:18 +02:00
lunarcleint b8643ad1f7 New add strumline button + editing + other charter bug fixes 2023-06-30 23:05:51 -07:00
NeeEoo e3a88da009 Added draw stuff, and custom fields to notes
And added onPostStrumCreation
2023-05-30 17:34:08 +02:00