Commit Graph
537 Commits
Author SHA1 Message Date
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
⍚~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
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 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
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
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
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
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
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 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
Ralty 241b87ad58 Change event params a bit and fix cam zooming 2025-06-30 10:49:38 +07:00
⍚~Nex 2a44c5ca1d replacing the discord rpc 2025-06-15 19:08:28 +02:00
Ne_Eo a6fcb3d237 Merge branch 'main' into pr/397 2025-06-06 20:39:24 +02:00
FuroandGitHub 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
FrakitsandGitHub f048942bcc i fucking hate this dude holy shit 2025-06-04 16:02:09 +03:00
FrakitsandGitHub 2992e01069 ts pmo icl 2025-06-04 15:52:45 +03:00
FrakitsandGitHub 8d026c9fc6 oops 😶 2025-06-04 15:25:48 +03:00
FrakitsandGitHub 2d76ba4e98 get ready for these powers 2025-06-04 15:03:25 +03:00
Ne_Eo c6c870270f Small HTML5 Fixes 2025-05-16 01:03:53 +02:00
Ne_Eo 31042a9039 Allow addons in mods folder
This allows people to add addons using `mods/<mymod>/addons/<myaddon>/`
2025-05-16 01:00:22 +02:00
Yoshman29 6480465d51 Failed to add attributes?? 2025-05-11 11:26:40 +02:00
Yoshman29 5609f18c6a Fixes for Linux systems 2025-05-11 11:15:22 +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 94296ffb44 Merge remote-tracking branch 'upstream/main' 2025-05-07 15:47:35 +02:00
TheZoroForce240 2b087dc96e floating point fixes (hopefully) 2025-05-05 17:53:43 +01:00
Ne_Eo a7415783bc Merge branch 'main' into pr/397 2025-05-05 15:38:45 +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
MicrokatandGitHub 98da050c17 add fps to loadAnimatedGraphic (#626)
* add fps to loadAnimatedGraphic

wow and it doesn't even break old mods :0

* you'll float too

hi georgie
2025-05-02 23:15:36 +02:00
⍚~Nex 4e91b600ff better if specified through code too 2025-05-02 18:15:10 +02:00
⍚~Nex ba92501968 adding maxMisses to ComboRating 2025-05-02 17:55:21 +02:00
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +02:00