Commit Graph
155 Commits
Author SHA1 Message Date
Ralty 9c7bb8f073 Aghhh variant, variation, whatever 2025-08-09 00:31:45 +07:00
Ralty b6d51123c7 Datas, Flags related stuff 2025-08-03 19:26:50 +07:00
Jamextreme140andGitHub 5b1c4653fe "BetaWarningState" import redirect + small fix (#16) 2025-07-29 10:52:46 +02:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02: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
⍚~Nex e6766cdcd7 dev mode implementation 2025-07-07 01:53:02 +02: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
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
⍚~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
⍚~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
ItsLJcoolandGitHub 315c5e007c added onScriptSetup so now instead of using onScriptCreated in HScript, you can now use this function whent the script is actually initalized!!!! LETS FUCKING GO!!! (#618) 2025-04-23 21:51:12 +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 1815c9d0c0 Merge branch 'main' into translations-system 2025-02-28 16:49:28 +01:00
Ne_Eo 023e7753b2 Merge branch 'main' into new-editors 2025-02-06 21:22:45 +01:00
Ne_Eo bb42fdc583 Fixed bug with last commit + more bug fixes 2025-01-24 02:49:42 +01:00
Ne_Eo cbbb598f52 Added some more flags 2025-01-24 01:51:25 +01:00
Ne_Eo 5f51df0f3f Merge branch 'main' into new-editors 2025-01-22 22:25:21 +01:00
Ne_Eo 1aa136469d Fix duplicated line message in errors 2025-01-19 21:03:01 +01:00
Ne_Eo fe0542a32c Merge branch 'main' into translations-system 2025-01-09 20:26:29 +01:00
Ne_Eo fdf53b3d4f Merge branch 'main' into new-editors 2025-01-09 20:05:06 +01:00
Ne_Eo f50cbdbb80 Fix highscores being deleted 2024-12-19 22:38:38 +01:00
Ne_Eo aec73ab2b6 Added some more documentation 2024-12-16 04:37:18 +01:00
Ne_Eo a20020bc3c Merge remote-tracking branch 'upstream/main' 2024-12-16 03:13:23 +01:00
e2a3951702 Transition crash fix again + changeable transition script (#493)
* fix transition crash when skipping

* transition crash fix again

* rename transition script var

* better transition scripting

* add more transition script functions

* move post create to actually be after

* change this

* actually destroy the script

* add a variable to disable skipping the transition

* opa

idk felt better like this

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-12-14 16:48:58 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +01:00
Ne_Eo 80ef390095 Merge branch 'main' into translations-system 2024-11-29 22:06:37 +01:00
Ne_Eo 0d357171cf Merge branch 'main' into new-editors 2024-11-29 22:05:11 +01:00
Ne_Eo cd0f06f448 Merge remote-tracking branch 'upstream/main' 2024-11-29 22:02:37 +01:00
SrtHero278 a2a12f121e quick fix 2
classes not using the correct line number.
2024-11-25 11:33:48 -08:00
Ne_Eo 204a151170 Merge branch 'main' into new-editors 2024-11-15 18:50:48 +01:00
Ne_Eo 5f16024b3e Merge branch 'main' into translations-system 2024-11-15 18:13:04 +01:00
⍚~Nex 77b7eebed1 better events and funkinSave categorization 2024-11-15 17:52:19 +01:00
Ne_Eo 1713e8700d Import Redirects + fix videos not able to be longer than 25 days 2024-11-15 15:26:12 +01:00
Ne_Eo 17301f6951 Small changes 2024-11-15 14:46:44 +01:00
Ne_Eo 625b03eee4 Merge branch 'main' into base-fnf-port-remake 2024-11-15 14:13:05 +01:00
⍚~NexandNe_Eo 596cb850cc What? Constants is evolving into Flags!
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-11-15 13:58:35 +01:00
Ne_Eo f0eea9eb8e Merge remote-tracking branch 'upstream/main' 2024-11-15 11:48:50 +01:00
b1b1663f5c Event based dialogue handling (#443)
* Event based dialogue handling

* better imo

* typo

* Small script example

new script by NexIsDumb

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-11-14 01:29:12 +01:00
5ea2f57e25 judgements and combo can now be toggled off in hscript (#439)
* Update PlayState.hx

* movin and changin names

* the fucking space

* e e ee e ee ee SANS??

* mama SANS behind you❤️

help me

* brother...

* BROTHER...

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-11-12 00:52:55 +01:00
Ne_Eo 2f71bf4426 Merge branch 'main' into translations-system 2024-11-09 01:05:26 +01:00
Ne_Eo 2fc32231ab Merge remote-tracking branch 'upstream/main' 2024-11-09 01:00:11 +01:00
Ne_Eo 25b563066f Allow hold notes to be forced deleted 2024-11-06 19:54:15 +01:00
⍚~Nex 4c94bb61a7 Merge branch 'main' into base-fnf-port-remake 2024-10-21 17:50:30 +02:00
Ne_Eo 6636bffc42 Merge branch 'main' into translations-system 2024-10-18 03:05:11 +02:00
Ne_Eo 5801ed0840 Merge branch 'main' into new-editors 2024-10-18 03:02:13 +02:00
Ne_Eo 9640c3e17e Merge remote-tracking branch 'upstream/main' 2024-10-18 02:53:24 +02:00