Commit Graph
2532 Commits
Author SHA1 Message Date
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 ba525ac0e4 oh my god 2025-07-19 14:41:19 +07:00
RaltyandGitHub 5cc10b2656 Merge pull request #8 from chronicsilly/patch-3
prettyprint option on stage xmls
2025-07-19 14:34:20 +07:00
Ralty 8259266f44 Small fixes 2025-07-19 14:10:54 +07:00
Ralty 19c6b5a83c Merge branch 'new-editors-main' into new-editors 2025-07-19 09:36:32 +07:00
Ralty 431928685d Merge remote-tracking branch 'upstream/main' into new-editors-main 2025-07-19 01:41:27 +07:00
Ralty f95ac046d6 Whoops! 2025-07-19 01:38:58 +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
Frakits cca1c75c14 accidentally made the whole thing uncompilable oops 2025-07-18 13:04:23 +03:00
Frakits e00b600650 SIIGHHH 2025-07-18 12:59:41 +03:00
Chronic x3andGitHub 5656ecdd93 prettyprint option on stage xmls 2025-07-17 15:41:51 +01: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
TheoDevandGitHub c4af35d9dd Merge pull request #6 from chronicsilly/patch-1
tgirl yuri
2025-07-15 06:00:37 -07:00
Chronic x3andGitHub e02c93fab1 Update Options.hx 2025-07-15 13:53:31 +01:00
⍚~Nex ce1ec6579f why was this edited @YoshiCrafter29 ??😭 2025-07-07 01:57:24 +02: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 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
6f7c3a4278 Options/Credits from multiple asset libraries + Fix options transition when exiting Controls (#367)
* load all options from all asset libraries

* add override for options

* removing overridedMods

* fixing the options transin not appearing

when exiting keybinds substate

* making it for credits too

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-06 00:14:34 +02:00
Ralty 5ee4ff2a10 can you please lock in 2025-07-05 19:07:57 +07:00
Ralty bdfb1d31b4 Update Conductor.hx 2025-07-05 19:06:48 +07: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
Ralty 2b533d62f5 dummyChange & lastBeatChange 2025-07-05 18:19:49 +07:00
Ralty 7003a98c9d Update Charter.hx 2025-07-05 14:17:50 +07:00
1995c7ff93 [ENHANCEMENT] Add Volume Keys to Controls (#518)
* add ze volume keys B)

* e

* better

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 03:44:42 +02: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
⍚~Nex e13486dec0 WHAT THE FUCK IS THIS
I DIDNT NOTICE😭
2025-07-05 02:15:35 +02:00
9d1392399b Add noExtension flag to getFolderContent for cleaner Paths usage (#654)
* yeah

* Revert "yeah"

This reverts commit 5ab6ab8c7d.

* idk wtf happend

* Fixed Missing Curly Bracket

* hi

---------

Co-authored-by: Furo <furogaming9@gmail.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 02:13:30 +02:00
7a39947b7f a little charter bugfixs and dont show strumlines locks if there no strumline in the chart (#664)
* dbssdbihsadibjsdainbi

* g

* a little charter fixs

* Update README.md

* ihateyou GitHub

* there

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 02:04:10 +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
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
bd79dd2e39 Week6 pixel fix + more syntax cleanup (#662)
* Fixed some issues with antialiasing not being set

like wtf man why isn't it set do false in da code

* oops i forgor i was testing smth lol

* forcing the note sprites to be non aliased

* fine lmao

Co-authored-by: Til <89487150+TechnikTil@users.noreply.github.com>

* my take

* yes i will shut the fuck up now

---------

Co-authored-by: Til <89487150+TechnikTil@users.noreply.github.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-04 21:51:54 +02:00
TilandGitHub 6d18935388 use haxelib run lime for compiling, so that lime from cne setup is used for compiling (#674) 2025-07-04 20:45:04 +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
TeejioandGitHub 1ca98b3013 Add LoopTime to CoolUtil.playMusic ini Files (#673)
* Update CoolUtil.hx

* Update CoolUtil.hx

* realized i like it in sec more than ms
2025-07-02 11:34:50 -04:00
sageandGitHub 291c1d25bf Allow pathBack on Linux (for the command) (#658) 2025-07-02 11:32:14 -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
TilandGitHub 8eee609756 vcr.ttf changes when switching mods now, if it was inside source code (#672) 2025-07-02 11:37:19 +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 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