Commit Graph
497 Commits
Author SHA1 Message Date
💜 Rodney, An Imaginative Furball 💙andGitHub 2d6b85365b Update PlayState.hx (#742) 2025-08-27 04:48:44 +07:00
Ralty ec63be9e77 Fix backward comp issues and freeplay 2025-08-09 20:00:49 +07:00
Ralty 8aa2023057 cancellable onSongEnd 2025-08-09 15:43:04 +07:00
Ralty 91abb37281 Fix 2025-08-09 13:23:02 +07:00
Ralty 32bca0420e Change storyPlaylist, backward comp in loadSong 2025-08-09 13:22:53 +07:00
Ralty 9c7bb8f073 Aghhh variant, variation, whatever 2025-08-09 00:31:45 +07:00
Ralty 05006802ee Bring back needsVoices, add vocalsSuffix in meta 2025-08-08 17:54:39 +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 90fc02c128 Oh thats why 2025-08-07 22:43:27 +07:00
Ralty cbaa5a6155 Don't resync Inst too in resyncVocals, stupid 2025-08-07 22:32:30 +07:00
Ralty 1f479a5b16 fix beatHit twice during start 2025-08-07 22:29:44 +07:00
Ralty 967bd4cf01 An attempt to fix stutters for low-end computers 2025-08-07 22:23:45 +07:00
Ralty 9c7cc22a47 An attempt to fix skipping the next song randomly 2025-08-07 20:01:23 +07:00
Ralty 1993d205ca Camera Bop 2025-08-06 21:06:28 +07:00
Ralty f8aa7201c0 camGameZoomMult, camHudZoomMult 2025-08-06 19:22:26 +07:00
Ralty 70195051ec Zoom Multiplier for camZooming 2025-08-06 17:51:13 +07:00
Ralty b6d51123c7 Datas, Flags related stuff 2025-08-03 19:26:50 +07:00
Frakits ef4dd0a32f these fucking workflow runs dude 2025-08-02 14:54:04 +03:00
Ralty 271097c081 wtf frakits 2025-08-02 18:40:52 +07:00
Frakits 341454b01e LET THERE BE `STATE REDIRECTS`!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2025-08-02 14:20:46 +03:00
Frakits 88218dfe00 h 2025-08-01 13:56:12 +03:00
Frakits f57f4590a9 h 2025-07-24 21:26:21 +03: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 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 c987a0cd19 Fix New-Conductor 2025-07-16 20:06:15 +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 96d60cfe8c Streamed Vocals? 2025-07-12 02:34:55 +07:00
Ralty aa5cf639e8 Fix Resyncing 2025-07-10 16:16:55 +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 86157be887 some cutscene stuff 2025-07-06 17:50:15 +02:00
⍚~Nex a6c390f10e making health updating auto
more optimised than doing it each frame
2025-07-06 14:43:00 +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
07ae6b643c FINALLY fixed the issue with GlobalState blowing up when pressing F5. (#666)
* peak is happening

<r>RED<r>

* oops

* oops x2

forgot I left a trace when loading up global.hx from `Assets` lol

* **State / SubState reloading broken rn but pushing changes to see if anyone can fix**

* Human... I remember you
<r>disabling reloading substates cuz it broke...<r>

* <y>forgor to edit assets global.hx<y>

* lemme see

* kk

* opa

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 01:46:42 +02:00
Frakits 9db001101a [REQUIRES TESTING] removed lowercasing requirement in song parsing 2025-07-01 10:18:46 +03:00
Ralty 1a8646f4e8 Update PlayState.hx 2025-06-30 22:39:15 +07: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
skiwcadandGitHub 7fc8e6d85b convert difficulty to lowercase before checking difficulty scripts folder (#646) 2025-06-04 16:23:20 +02: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 741ff3fd6f Added back moveCamera 2025-05-07 15:59:22 +02:00
Ne_Eo 94296ffb44 Merge remote-tracking branch 'upstream/main' 2025-05-07 15:47:35 +02:00
Ne_Eo a7415783bc Merge branch 'main' into pr/397 2025-05-05 15:38:45 +02:00
SenDoesStuff 4d7288bf4e variable name change 2025-05-05 09:24:05 -04:00