Commit Graph
108 Commits
Author SHA1 Message Date
Ralty 6e2af842e2 sorry 2025-08-04 19:08:55 +07:00
Ralty c6a511a042 whoops 2025-08-04 19:02:10 +07:00
Ralty 38997b4765 Don't duplicate default asset library 2025-08-04 18:08:21 +07:00
HeroEyad 50aa23c797 zzz 2025-07-28 22:38:59 +03: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 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
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
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +02:00
Ne_Eo b5b604e580 Bug fix: Fix issues with extra libraries 2025-05-02 02:05:22 +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 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
⍚~Nex 5ab8a02a10 Merge remote-tracking branch 'public/main' 2025-01-03 19:18:18 +01:00
74884854ea Fixes a crash when no mod folders are founded (#515)
* Fixes a crash when no mod folders are founded

Hi

* lemme

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-01-02 03:09:14 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +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
⍚~NexandNe_Eo 69a2f9f953 2 men,1 pregnant WIP 1
we're so back

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-10-03 01:12:49 +02:00
Ne_Eo 9febce79c1 Fix hierarchy of libs + Cleaner Tree Info 2024-10-02 22:24:35 +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
Ne_Eo de0a02dd50 Fixing another bug 2024-08-16 18:24:54 +02:00
Ne_Eo dbd2219b20 Cleanup + Optimization 2024-08-02 00:42:47 +02:00
Ne_Eo a793aab503 Merge branch 'main' into translations-system 2024-07-18 22:06:47 +02:00
Ne_Eo b2774445d8 Merge branch 'main' into new-editors 2024-07-18 22:01:45 +02:00