Commit Graph
176 Commits
Author SHA1 Message Date
HEIHUAaandGitHub 7dcbbc3c64 Update PsychParser.hx (#841) 2025-11-30 12:47:58 +07:00
JurtaandGitHub cdb751e6e1 Fix events file not being removed when all global events are deleted (#826). Friday Night Funkin' 2025-11-19 07:00:12 +07:00
Ralty 7a9edf809c Redo 95b4d888f0 2025-10-05 14:09:12 +07:00
Ralty 7719fd6a10 Revert "Push unique event to Event List Once (#785)"
This reverts commit 95b4d888f0.
2025-10-05 14:07:24 +07:00
LasyandGitHub 95b4d888f0 Push unique event to Event List Once (#785)
* Update EventsData.hx

* Update EventsData.hx again
2025-10-05 09:51:50 +07:00
BetopiaandGitHub 43e6aac281 fix meta loading in Chart.parse or idk what should i call this (#741)
an argument was missing.. i think
2025-08-18 12:23:51 +02:00
Ralty 3fd87c8d52 Dont force set chart name 2025-08-10 08:34:57 +07:00
Ralty 978022dc0b Fix VSliceParser crash 2025-08-10 08:25:52 +07:00
Ralty 7568cbfd99 songVariations -> variants 2025-08-10 07:42:45 +07:00
Ralty c5686b09db Fix Chart Saving in assets/assets if no path found 2025-08-10 07:41:12 +07:00
Ralty 037f564676 forgor 2025-08-10 05:17:10 +07:00
Ralty 9e4b6f31c0 Bring back difficulty metas for now 2025-08-10 05:16:16 +07:00
Ralty 39237dd01d Fix creating variation & VSliceParser 2025-08-09 17:52:18 +07:00
Ralty d3bd40baf3 Seperate global events for variations 2025-08-09 16:40:57 +07:00
Ralty 7d7db50c19 Fix Variation Editor Crash 2025-08-09 15:54:03 +07:00
Ralty 91abb37281 Fix 2025-08-09 13:23:02 +07:00
Ralty 9c7bb8f073 Aghhh variant, variation, whatever 2025-08-09 00:31:45 +07:00
Ralty 3939439086 Chart Variations Backend Implementation 2025-08-08 20:50:12 +07:00
Ralty 05006802ee Bring back needsVoices, add vocalsSuffix in meta 2025-08-08 17:54:39 +07:00
FrakitsandGitHub 41474738c7 Update Chart.hx 2025-08-07 21:07:33 +03:00
Ralty bcbfa90f37 Fix Freeplay Difficulty Inst Suffix 2025-08-08 00:38:03 +07:00
Ralty 65839283e5 Quick fix crash freeplay 2025-08-08 00:19:01 +07:00
Ralty d2a113907a instSuffix, meta.metas for freeplay preview 2025-08-08 00:07:49 +07:00
Ralty d3ef27b9c7 ChartData no longer needs needsVoices (pun) 2025-08-07 23:18:43 +07:00
Ralty 1993d205ca Camera Bop 2025-08-06 21:06:28 +07:00
Ralty 272f862c69 Attempt to fix linux not loading songs? 2025-08-05 18:23:58 +07:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02: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 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
Ralty 34b4de31fc Should be done 2025-07-06 10:33:25 +07: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
Ralty 1a66b7109c Merge remote-tracking branch 'upstream/main' into pr/397 2025-07-05 18:23:41 +07: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
Ralty 9982236321 Whoops! 2025-06-30 22:29:21 +07:00
Ralty 241b87ad58 Change event params a bit and fix cam zooming 2025-06-30 10:49:38 +07:00
Ne_Eo a6fcb3d237 Merge branch 'main' into pr/397 2025-06-06 20:39:24 +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
⍚~Nex 44aba206e8 im gonna end it all
dawg i swear sleeping 4h doesnt help
2025-05-05 01:46:43 +02:00
⍚~Nex 7970265e6b oh it was so broken LMAOO 2025-05-04 23:03:55 +02:00
⍚~Nex 921ab3da63 forgor vslice shits + better camera tweens
hopefully works, sen pls test these with your vslice charts🥹
2025-05-04 22:34:53 +02:00
⍚~Nex 5751ad5d43 fixing a bunch of stuff + camera position event 2025-05-04 19:53:54 +02:00
SenDoesStuff 4b2acd4a8e buh 2025-05-04 12:21:19 -04:00
SenDoesStuff 22f78da8fb Fix Camera Zoom Event
Please let me know if this breaks anything and I will fix it as soon as I can :0
2025-05-04 12:18:05 -04:00
⍚~Nex 226c7f84a6 more progress + psych/legacy importer 2025-04-05 03:38:36 +02:00
⍚~Nex cfe209067c updated vslice structures + using the class funcs 2025-04-04 23:28:49 +02:00
⍚~Nex c44fa191dd bruh 2025-04-04 00:47:59 +02:00