Commit Graph
202 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
lunarcleint aeff7568e3 WAIT 2025-05-22 14:49:05 -07:00
lunarcleint 4b057d1ee3 fix character creation!!! >:D 2025-05-22 14:37:49 -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
⍚~Nex 895fb5c981 fixed healthicons in editors 2025-04-21 03:41:08 +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
lunarcleint d2fb59ecd4 pmo </3 2025-03-26 15:12:28 -07:00
lunarcleint d3036a7275 fix right click on character editor 2025-03-26 11:40:03 -07:00
lunarcleint 038d4db840 cscfs 2025-03-25 01:57:29 -07:00
lunarcleint 991bf802c4 directory saving in uiexplorerthingy 2025-03-25 01:45:16 -07:00
lunarcleint 7e66f256da finish character editor undos!!! 2025-03-25 00:01:48 -07:00
lunarcleint ecbec5de4e undos finsished i think >:D 2025-03-20 13:04:51 -07:00
lunarcleint 1c08240a97 ds 2025-03-20 12:17:03 -07:00
lunarcleint e353b1dbcd faster compiles pls 2025-03-20 12:16:22 -07:00
lunarcleint 535ff8cec8 undos pt 2 im going to sleep 2025-03-20 04:06:23 -07:00
lunarcleint 4b9d32fb50 character editor undos part 1 2025-03-20 03:08:54 -07:00
lunarcleint 9d553c7a75 fix stupid flipped bug 2025-03-19 22:20:56 -07:00
lunarcleint 37bfe39dfd bleh :PPPPP 2025-03-18 01:43:10 -07:00
lunarcleint 7b39ecf415 hopefully all fixed 2025-03-15 12:45:37 -07:00
lunarcleint 954828753e atlas dragging + hitboxes 2025-03-08 04:42:09 -07:00
Ne_Eoandlunarcleint 224b35c070 WIP bounds for flxanimate
Co-Authored-By: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
2025-03-06 02:22:04 +01:00
lunarcleintandNe_Eo 97707015d8 i hate you liveshare ft neo
Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com>
2025-03-05 15:17:29 -07:00
lunarcleint 0970a63dd1 AUTOCOMPLETE FOR ANIMS!!! 2025-03-04 19:52:58 -07:00
lunarcleint d0a7f91106 ts pmo 🥀😭 2025-03-04 19:39:13 -07:00
lunarcleint cdf4890c98 fix checking existing on creation 2025-03-04 19:35:07 -07:00
lunarcleint 0cbdbfee0b character creatioin tests >:D 2025-03-04 19:18:55 -07:00
lunarcleint 61e920022d Merge branch 'new-editors' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev into new-editors 2025-02-28 20:13:01 -07:00
lunarcleint f51e2fd3fa edit sprite alot better!!! 2025-02-28 20:12:59 -07: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
lunarcleint 2d35c1983e edit sprite (pls test i need alot, kinda buggy) 2025-02-26 23:52:54 -07:00
lunarcleint 66265c867f stupid bug 2025-02-25 15:41:17 -07:00
lunarcleint 52872cd837 some stuffs >:D 2025-02-25 15:26:32 -07:00
lunarcleint 1d86fe00b5 bleh >:P 2025-02-24 17:20:26 -07:00
lunarcleint 77e4fd807f little bug fix 2025-02-24 16:14:46 -07:00
lunarcleint c2720890c2 resizable character editor 2025-02-24 16:05:45 -07:00
lunarcleint 1f4d263dd3 atlas ghostes :O 2025-02-24 15:18:57 -07:00
lunarcleint 47c759e100 Atlases should no longer crash... 2025-02-24 14:21:44 -07:00
lunarcleint a65c21edb7 Invalid Animation support!!! :D 2025-02-24 14:17:12 -07:00
lunarcleint 5ed03ce0fa make it a bit more obv if the ghost is off 2025-02-22 17:14:58 -07:00
lunarcleint 04a2f72d95 fix weird cursor stuff on windows >:D 2025-02-22 17:09:19 -07:00
lunarcleint 29c90d3cb7 no longer random flips >:D 2025-02-22 17:00:36 -07:00
lunarcleint 3f92337d58 fix flipped gizmos 2025-02-22 16:24:24 -07:00
lunarcleint ed841e50a3 fully move to draw util !! 2025-02-22 16:03:30 -07:00
lunarcleint 1d745f3519 testing webhook >:D 2025-02-18 13:13:59 -07:00
SevDoesStuffandGitHub ec2cae9f81 character editor Icon color wheel fix (#496)
* character Icon color wheel fix

* better method lol (thank you lunar)
2025-01-20 13:17:42 -05:00
lunarcleint 117c3a2dab image uploader 2025-01-14 17:37:21 -07:00
Ne_Eo fdf53b3d4f Merge branch 'main' into new-editors 2025-01-09 20:05:06 +01:00