Commit Graph
63 Commits
Author SHA1 Message Date
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 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +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
Frakits 9db001101a [REQUIRES TESTING] removed lowercasing requirement in song parsing 2025-07-01 10:18:46 +03:00
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +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 69a17d5fef Merge branch 'main' into new-editors 2025-02-28 16:39:06 +01:00
Ne_Eo 3851ede84d Merge remote-tracking branch 'upstream/main' 2025-02-28 16:38:04 +01:00
Ne_Eo dab6a3b520 Small crash fix 2025-01-19 22:04:03 +01: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
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
⍚~Nex 759dbaed6a actually 2024-11-11 20:10:29 +01:00
StrawberrySageandGitHub 1aacf14c6b Make Paths.getAssetsRoot() return the source assets rather than the exported assets when using ./cne test (#389) 2024-11-11 20:05:52 +01:00
⍚~Nex 4a1bc2c147 Merge branch 'main' into base-fnf-port-remake 2024-11-03 21:39:23 +01:00
Ne_Eo 68c2feab37 Folder support for characters (WIP) 2024-11-01 19:47:10 +01:00
Ne_Eo de59b305cc Folder support for characters (WIP) 2024-10-26 23:46:05 +02: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
⍚~Nex a8860604e8 mods dialogues fonts fix 2024-10-08 15:51:40 +02:00
Ne_Eo 4e4ebf5eb1 Merge branch 'main' into base-fnf-port-remake 2024-10-02 21:27:45 +02:00
Ne_Eo 45958b0032 Merge branch 'main' into translations-system 2024-10-02 21:26:56 +02:00
Ne_Eo f2cbf0dc7d Merge branch 'main' into new-editors 2024-10-02 21:26:03 +02:00
Ne_Eo fc0a39fa6a small change 2024-10-02 21:25:09 +02:00
Ne_Eo 4b783a983e Added ext support to paths 2024-08-31 20:43:37 +02:00
⍚~Nex 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
⍚~Nex 3683a54298 Merge branch 'main' into translations-system 2024-06-09 01:38:14 +02:00
NeeEoo e36bce364a Merge branch 'stage-editor' into new-editors 2024-04-27 20:26:56 +02:00
swordcubeandGitHub ea52e25251 guys we should probably check if frames isn't null First 2024-04-26 06:22:10 -05:00
NeeEoo a04d93b7c3 Small Cleanup 2024-04-24 03:15:22 +02:00
NeeEoo 2164131271 Merge branch 'main' into translations-system 2024-04-12 12:18:51 +02:00
NeeEoo 308af270eb Small Improvements 2024-04-12 12:14:51 +02:00
NeeEoo 070db1c2bd Merge branch 'main' into translations-system 2024-04-11 14:30:58 +02:00
NeeEoo 75e35b30e1 Forgot to organize these 2024-04-11 14:27:37 +02:00
NeeEoo 244fddc3c7 Made the code work + Cleaned up Code 2024-04-10 18:57:18 +02:00
Ne_Eoand⍚~Nex e068300cf1 Improved Macros + Libraries (WIP)
Co-Authored-By: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-04-09 18:32:57 +02:00
⍚~Nex 1981e29dc2 this should be better (still a wip)
i'll brb later to continue
2024-04-07 16:58:29 +02:00
NeeEoo c8d96f0162 Cleanup 2024-04-07 03:33:27 +02:00
⍚~NexandNe_Eo a14f75b2ef you know the fuck what
still a wip

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-04-07 03:02:16 +02:00
NeeEoo c19c9ebc55 Fixed format string 2024-04-05 01:55:00 +02:00
⍚~Nex 221d1c8cda the main.xml loads now 2024-04-02 00:39:53 +02:00
⍚~Nex aa9af9b052 very early wip
might crash idk
stuff is super very undone i still havent tested as i gtg for now
2024-04-01 21:10:09 +02:00
NeeEoo f8b20774e3 Remove useless indentation 2024-03-16 21:15:18 +01:00
NeeEoo e6ff26fd2e Fixing script crash message
No more LIB_modname.hx in the logs
2024-02-11 20:46:08 +01:00