Commit Graph
766 Commits
Author SHA1 Message Date
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 9a73ebbc31 Merge remote-tracking branch 'origin/main' 2025-08-01 13:56:23 +03:00
Frakits 88218dfe00 h 2025-08-01 13:56:12 +03:00
Ralty 581d61c0f9 Merge PR #2 2025-08-01 17:35:32 +07:00
Kolziak 51c720583a fucking shit why was the debugMode working like that 2025-07-31 20:37:41 +02:00
Chronic x3 fab4d1d788 Seperate pretty print options for the Chart, Character, and Stage editors.
The editors that save as xmls have pretty print enabled by default  btw
2025-07-25 17:38:20 +01: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 8259266f44 Small fixes 2025-07-19 14:10:54 +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
Ralty 34b4de31fc Should be done 2025-07-06 10:33:25 +07:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
Ralty e2ff493bdf Try to fix the characters dancing fast? 2
god damn it i got confused max with min sometime
2025-07-05 18:29:39 +07:00
Ralty 1a66b7109c Merge remote-tracking branch 'upstream/main' into pr/397 2025-07-05 18:23:41 +07:00
Ralty a5c208f4d3 Try to fix the characters dancing fast? 2025-07-05 18:20:21 +07:00
b41602ff37 extend <solid> functionality in stages (#633)
* extend <solid> functionality in stages

adds support for scroll(x/y), zoomfactor, and alpha to solids made in a stage xml  . because Why not

* better

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 03:23:32 +02: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
TheZoroForce240andGitHub 8b05257ec5 fix loading stages with imported scripts outside of playstate (#678) 2025-07-04 19:35:54 +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
JadeandGitHub 09da78cfa9 that should be fine now, hopefully. 2025-07-02 09:38:05 -04:00
JadeandGitHub b55fb41f40 hey community can u check if left holds are still broken? 2025-07-02 09:00:36 -04: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 c53a276e99 Merge remote-tracking branch 'upstream/main' into pr/397 2025-06-30 22:34:03 +07:00
Ralty 9982236321 Whoops! 2025-06-30 22:29:21 +07:00
JadeandGitHub 5610d8abfe Update Note.hx 2025-06-30 09:43:26 -04:00
JadeandGitHub 0a3e2be417 fix left hold thanks axieaxolotl_ 2025-06-30 09:42:27 -04:00
senandGitHub 7de52cc288 Adding a check for both notehold names in the xml smiley face :D (#660) 2025-06-30 08:31:09 -04:00
Ralty 241b87ad58 Change event params a bit and fix cam zooming 2025-06-30 10:49:38 +07:00
TilandGitHub 34f2061479 wanrning 😭 (#656) 2025-06-21 13:44:55 +02:00
TheoDevandGitHub 7daa7a5706 Add extra info for Note Splashes (#558)
* add extra info for splashes

* nullable

* moved SplashHandler.__copyFrom to Splash.copyFrom
2025-06-09 20:28:12 +02: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
Furo a990da0849 Fix Version Being Null + Fixed Icon Transitions Offset 2025-06-04 15:59:02 +02:00
⍚~Nex 137af7fdb6 lil dialogue fix
if u had another dialogue starting in the callback, in the new script Dialogue.cutscene would be always null
2025-05-12 02:23:44 +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