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
Chronic x3 and GitHub
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 5ab6ab8c7dfurogaming9@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
TheZoroForce240 and GitHub
8b05257ec5
fix loading stages with imported scripts outside of playstate ( #678 )
2025-07-04 19:35:54 +02:00
Ralty and GitHub
e4baf51e06
Fix Inconsistency in Sustain Input ( #663 )
...
Make player sustains the same as cpu sustains
2025-07-02 11:40:56 -04:00
Teejio and GitHub
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
sage and GitHub
291c1d25bf
Allow pathBack on Linux (for the command) ( #658 )
2025-07-02 11:32:14 -04:00
Jade and GitHub
09da78cfa9
that should be fine now, hopefully.
2025-07-02 09:38:05 -04:00
Jade and GitHub
b55fb41f40
hey community can u check if left holds are still broken?
2025-07-02 09:00:36 -04:00
Til and GitHub
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
Jade and GitHub
5610d8abfe
Update Note.hx
2025-06-30 09:43:26 -04:00
Jade and GitHub
0a3e2be417
fix left hold thanks axieaxolotl_
2025-06-30 09:42:27 -04:00
sen and GitHub
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
Til and GitHub
34f2061479
wanrning 😭 ( #656 )
2025-06-21 13:44:55 +02:00
Chronic x3 and GitHub
26cc14f834
this has NOT been annoying me for ages ( #649 )
2025-06-16 13:49:48 +03:00
⍚~Nex
2a44c5ca1d
replacing the discord rpc
2025-06-15 19:08:28 +02:00
TheoDev and GitHub
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
Betopia and GitHub
f989a1b955
fix sound length rounding to seconds ( #645 )
2025-06-04 16:23:51 +02:00
skiwcad and GitHub
7fc8e6d85b
convert difficulty to lowercase before checking difficulty scripts folder ( #646 )
2025-06-04 16:23:20 +02:00
Furo and GitHub
0ee90abe98
Fix wmic ( #642 )
2025-06-04 16:21:28 +02:00
Furo
a990da0849
Fix Version Being Null + Fixed Icon Transitions Offset
2025-06-04 15:59:02 +02:00
Frakits and GitHub
f048942bcc
i fucking hate this dude holy shit
2025-06-04 16:02:09 +03:00
Frakits and GitHub
2992e01069
ts pmo icl
2025-06-04 15:52:45 +03:00
Ralty