Commit Graph
215 Commits
Author SHA1 Message Date
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 94296ffb44 Merge remote-tracking branch 'upstream/main' 2025-05-07 15:47:35 +02:00
Ne_Eo c2a7b5af11 Trim + Optimize images 2025-05-07 14:48:40 +02: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 13033b2675 Merge remote-tracking branch 'upstream/main' 2025-04-10 02:24:58 +02:00
Ne_Eo 6c0b245634 Optimize images (-808.7 KB)
The following weren't optimized since they did not retain the pixels fully:
- assets/images/editors/charter/strumline-drag.png
2025-04-10 02:16:15 +02:00
lunarcleint 2a53c86eb0 :OP 2025-04-08 18:24:32 -07:00
lunarcleint b1f9f3fb1a fix character editor bugs +clean up code 2025-04-08 18:23:16 -07:00
EfanzeDevandGitHub c7c2794e84 Vanilla Num1 Sprite Update (#605)
* vanilla num1 update (#1)

* Updated vanilla num1 to match up with latest game update (Post-Vslice)
(FUNKIN ART STYLE)

* vanilla num1 update (#2)

* Updated vanilla num1 to match up with latest game update (Post-Vslice)
(PIXEL ART STYLE)
2025-04-07 15:16:27 +02:00
lunarcleint a65c21edb7 Invalid Animation support!!! :D 2025-02-24 14:17:12 -07:00
Ne_Eo 5f51df0f3f Merge branch 'main' into new-editors 2025-01-22 22:25:21 +01:00
Ne_Eo 18ea916f1a Change how editor icons work 2025-01-17 15:23:32 +01:00
Verwex 16672e9f59 editor icon reorganization + 3 more editor icons 2025-01-16 23:53:23 +01:00
Ne_Eo 204a151170 Merge branch 'main' into new-editors 2024-11-15 18:50:48 +01:00
Ne_Eo 625b03eee4 Merge branch 'main' into base-fnf-port-remake 2024-11-15 14:13:05 +01:00
Ne_Eo f0eea9eb8e Merge remote-tracking branch 'upstream/main' 2024-11-15 11:48:50 +01:00
NyxieFemboyandGitHub 9d51b9db8f fixes to character offsets/indices (Not meant to reflect base game) (#388) 2024-11-14 02:15:12 +01:00
⍚~Nex f5a3fb3ce6 Merge branch 'main' into new-editors 2024-09-20 14:40:25 +02:00
⍚~Nex 7cf99ae7bc Merge branch 'main' into base-fnf-port-remake 2024-09-20 14:21:36 +02:00
VerwexandNe_Eo d5740b4e24 editor picker icons
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-09-19 22:03:27 +02:00
⍚~Nex 49db1a089a hell, here we are again 2024-08-27 17:46:44 +02:00
Ne_Eo 759e03a1d4 Merge branch 'main' into new-editors 2024-08-27 03:50:31 +02:00
⍚~Nex 166c5f4411 ..CREDITS MAIN MENU SPRITES FINALLY🔥
since they were finally official😭
2024-08-27 03:43:11 +02:00
⍚~Nex 67f9627dcd optimized main menu sprites and... 2024-08-27 03:37:03 +02:00
24a65a4a8a added "-loop" stuff (#278)
* added "-loop" stuff

* added loop anims to the chars

* added to mom and dad for their funny eye glow

* explanation

* Update da.xml

* slightly optimized and a lil better

* oops

this would have actually caused issues since the it would have take the reversed value from the animation before -loop

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-08-27 02:27:37 +02:00
Ne_Eo 84c02338ee Merge branch 'main' into new-editors 2024-08-25 02:34:14 +02:00
Cobalt BarandGitHub 3ce7561f56 Asset optimization (#373)
* run oxipng on assets and art

* reset dialogueBox-evil.png and strumline-drag.png
2024-08-25 02:29:43 +02:00
Verwex c4cd719b89 Updated Radio Button 2024-08-24 19:47:31 +02:00
Ne_Eo 0319dad155 Drop down button + Optimization 2024-08-02 02:28:33 +02:00
lunarcleint 315d5b9ecd edit info screen 2024-07-25 18:55:12 -07:00
lunarcleint b8ba534702 mouse offsets (just a tiny bug with matrix on flipped) 2024-07-21 22:08:14 -07:00
Ne_Eo 930cf95d2f Updated the edit button on character editor 2024-07-21 17:41:52 +02:00
Ne_Eo 1158b94838 a 2024-07-21 17:25:17 +02:00
lunarcleint c1732b46ad drawTriangles for 9splice (mostly working) 2024-06-09 01:41:25 -07:00
SrtHero278 9847f1ebae quick button patch and nothing else 2024-05-11 07:54:38 -07:00
lunarcleint 0f342505a3 stuff 2024-04-29 14:32:16 -07:00
NeeEoo a80e5dce57 Merge branch 'character-editor-v3' into new-editors 2024-04-27 20:30:57 +02:00
lunarcleint ef532885ce i forgot 2024-04-23 19:44:43 -07:00
NeeEooandbetah 8b68b5ae35 New Trashcan icon
Co-Authored-By: betah <103602526+betah96@users.noreply.github.com>
2024-04-20 01:21:52 +02:00
NeeEoo 68264acf66 Implemented rotation + new dot sprite 2024-04-18 03:12:10 +02:00
NeeEoo e3fa6ceea9 New Icon for advanced Edit 2024-04-18 00:07:39 +02:00
NeeEoo a1a0b04cdb Remade the edit icon 2024-04-16 22:35:11 +02:00
NeeEooandbetah 53dc9d958e Added new visible icon (icon by betah)
Co-Authored-By: betah <103602526+betah96@users.noreply.github.com>
2024-04-16 21:50:09 +02:00
lunarcleint 548479e3e3 wip BUTTONS!!!! 2024-04-16 01:09:15 -07:00
NeeEoo 7fc83f340e Added radio buttons (wip image) 2024-04-16 03:37:23 +02:00
⍚~Nex ef2891bbe6 bye april fools😭
man that was buggy af
2024-04-02 23:50:59 +02:00
lunarcleint 014be749e6 Squashed commit of the following:
commit 4987983dc6e655183b34258fed905be2fba73e0a
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date:   Mon Apr 1 06:32:22 2024 -0700

    fix charter bug

commit 1135b53d4d4ab48fb74a9d5693579d0a2e4923db
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date:   Mon Apr 1 00:46:53 2024 -0700

    small changes

commit 102931f3511c9f0423cf887ebf91eaeeb1024abe
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date:   Sun Mar 31 23:03:03 2024 -0700

    update spelling mistakes

commit 87ad53ae91bc8b4d3b49af3ebb8c07db9f13765b
Author: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date:   Sun Mar 31 22:40:48 2024 -0700

    Chart editor updates

commit 8f7cae8a80a681158ff125c3e2547c9fd4dee7c1
Author: NeeEoo <NeeEoo@users.noreply.github.com>
Date:   Mon Apr 1 07:03:30 2024 +0200

    Redesigned Chart Editor

commit dbb94ba3bd8455a91883d6e5b59b25da87aefa32
Author: NeeEoo <NeeEoo@users.noreply.github.com>
Date:   Mon Apr 1 02:20:57 2024 +0200

    Added Stage Editor
2024-04-01 06:44:28 -07:00
lunarcleint 66f946d724 polish everything up 2024-03-22 22:26:43 -07:00
lunarcleint 6875b2126f stuff 2024-03-22 20:52:08 -07:00