Commit Graph
33 Commits
Author SHA1 Message Date
Frakits 94fbedb24e Revert "fix minor major bug"
This reverts commit c6fc648ea3.
2025-07-27 17:29:44 +03:00
Frakits c6fc648ea3 fix minor major bug 2025-07-27 16:20:08 +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
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +02:00
Furo 2f2bad2dc9 Icon Fixes 2025-04-21 20:24:36 +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
lunarcleint b1f9f3fb1a fix character editor bugs +clean up code 2025-04-08 18:23:16 -07: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 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
⍚~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 a69d6ce35f Made translation documentation + more
Made UpdateScreen translatable
Small fixes
2024-10-04 22:21:02 +02:00
⍚~NexandNe_Eo 562f1d8fc6 constants macros: reset(), init() and @:lazy
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-08-31 03:08:13 +02:00
⍚~Nex 500cf98e0c editable static costants!
for scripts :D
2024-08-31 02:31:05 +02:00
Ne_Eo d8d4c5907d Charter translatable 2024-08-17 01:26:10 +02:00
Ne_Eo 0319dad155 Drop down button + Optimization 2024-08-02 02:28:33 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo 4a34bb19d7 Cleanup 2024-03-05 17:54:34 +01:00
lunarcleint 561cf76876 nearly forgut 2024-02-03 16:01:46 -07:00
Frakits 5bddca1735 fixed, added 3 strumliners 2024-02-03 10:06:33 +02:00
lunarcleint 6a73241fed X Ratio :oooo 2024-02-03 00:37:18 -07:00
lunarcleint 287b797494 remove DUMB warning (also maybe 3d fix) 2024-02-02 16:26:59 -07:00
lunarcleint 86a52c10c4 ok this is DONE 2024-02-02 16:24:28 -07:00
lunarcleint 3eb2c0df51 Fix cameras on difficulty creation 2024-02-02 16:03:33 -07:00
lunarcleint 98f9354ae0 last polishes to this menu 2024-02-01 16:39:55 -07:00
Frakist 1810f86b58 completed chart saving (i think 2024-02-01 17:28:29 +02:00
Frakist ae931c3b75 chart actually saves (halfway) 2024-02-01 17:13:16 +02:00
lunarcleint fff3fd9cdc Strumline Button UI WIP (broke everything 😭) 2024-01-31 23:14:49 -07:00
Frakist 0eefa8a4b7 damaged brain 2024-01-31 22:19:07 +02:00
Frakist bc30119934 to be polished 2024-01-31 21:44:16 +02:00