Commit Graph
417 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 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
⍚~Nex 44aba206e8 im gonna end it all
dawg i swear sleeping 4h doesnt help
2025-05-05 01:46:43 +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
Ne_Eo 556b7682ef Added getStrumlineCamPos and getCharactersCamPos 2025-05-04 21:40:09 +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
⍚~Nex 31ae98fe44 updateRatingStuff as dynamic + adding iconArray
Resolves #624
2025-05-02 18:58:33 +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
75e934fd40 Difficulty based scripts (#623)
Makes possible things like `songs/dadbattle/scripts/erect/`.

* exclusive difficulty scripts

* fixing a small ordering bug + optimization

* actually, allowing both scripts to exist

* im a super fucking dumbass

* SPACES!!!

* suggestion from sen

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-05-01 23:45:26 +02:00
8c252bba81 Better Health Icons (#484)
* Better Health Icons

- Add Animated Icons Support
- Switch to Funkin Sprite
- Customizable Icon Bumps With HScript

* Moved icons

* Improve code and features for Health Icons V2

* Small fixes

* fix icons in editors

* Remove that not needed code

* Use better onFinish callback

* Animate Atlas icons

* Cleanup

* Small change

* sing anim nodes on icons and updateIconPos can be overitten on hscript

* remove sing nodes since its useless

* fix potential null function pointer

* remove that lines

* fixing compiling errors

* hawk tuah

* ORGANIZE THEM >:D

* mlem

imports are organized based on the func in vsc smh

* bruh

---------

Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-04-21 00:27:41 +02:00
Ne_Eo 13033b2675 Merge remote-tracking branch 'upstream/main' 2025-04-10 02:24:58 +02:00
⍚~Nex 96108634b4 bugfix of the freezing conductor
when pausing right on the frame the countdown ends
2025-04-07 17:26:16 +02:00
Chronic x3 29c7b29cc1 The fungus. 2025-04-07 14:59:58 +01:00
⍚~Nex 4972593b5f animation context for play animation event 2025-04-03 16:13:26 +02:00
⍚~Nex 9698c1e2f9 making vslice ease get saved properly 2025-04-03 02:18:08 +02:00
⍚~Nex 4b99ccf46a im a fucking dumbass 2025-04-02 02:31:03 +02:00
⍚~Nex 4b145bf62e A LOT OF NEW STUFF + more vslice events WIP
JUST GOTTA MAKE THE TWEEN ON THE CAMERA MOVEMENT FRUNCTION PROPERLY AND WE'RE GOOD
(and also make the charter not save not changed paramteres)
2025-04-02 01:50:00 +02:00
⍚~Nex ddebe14c4c oops 2025-04-01 01:39:52 +02:00
⍚~Nex 0f09306a44 normal vslice SUPPORT 2025-04-01 01:36:23 +02:00
⍚~Nex d27a79eceb fix for flipping stagepos specific characters 2025-03-20 19:33:52 +01:00
Ne_Eo 531f8b7882 HTML5 stuff 2025-03-16 03:52:18 +01:00
NyxieFemboy 62d57df27e i might be stupoid 2025-03-08 19:01:01 -05:00
NyxieFemboy 26ac15e173 added a comment 2025-03-08 16:59:29 -05:00
NyxieFemboy d43c043dce bandaid fix for beat 0 i guess 2025-03-08 16:13:47 -05:00
NyxieFemboy 098f747462 working on fixing camera beat timing, only issue is time sig changes on curBeat 0 now 2025-03-04 01:39:06 -05:00
TheZoroForce240andGitHub 650c0f4aed Fix Hscript Call event not calling public and static functions (#459)
* fix hscript call event not calling public/static functions

also can now call character scripts

* cache args
2025-03-01 14:11:23 +01:00
Ne_Eo 3851ede84d Merge remote-tracking branch 'upstream/main' 2025-02-28 16:38:04 +01:00
⍚~Nex 2227231264 Merge branch 'main' into pr/397 2025-02-25 19:38:41 +01:00
Ne_Eo 28868d8652 Better logs helpers 2025-02-06 21:14:24 +01:00
⍚~Nex 93c6542a95 nvm this is more performant
why did i have to separate it
2025-02-01 17:33:48 +01:00