Commit Graph
287 Commits
Author SHA1 Message Date
Furo 17f072a40f Stage Editor Translatable 2025-07-23 19:49:43 +02:00
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02:00
Ralty 2843d8a3a3 Merge branch 'main' into new-editors-conductor
# Conflicts:
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/backend/utils/IniUtil.hx
#	source/funkin/editors/character/CharacterEditor.hx
#	source/funkin/editors/ui/UIWarningSubstate.hx
2025-07-19 23:51:52 +07:00
Frakits 6f8330f91b h 2025-07-19 14:40:40 +03:00
Ralty 431928685d Merge remote-tracking branch 'upstream/main' into new-editors-main 2025-07-19 01:41:27 +07: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
Frakits e00b600650 SIIGHHH 2025-07-18 12:59:41 +03:00
⍚~Nex 1b0ad7d3a6 some more stuff SOMEONE HAVE TO TEST THESE 2 COMM 2025-07-06 04:44:46 +02:00
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
07ae6b643c FINALLY fixed the issue with GlobalState blowing up when pressing F5. (#666)
* peak is happening

<r>RED<r>

* oops

* oops x2

forgot I left a trace when loading up global.hx from `Assets` lol

* **State / SubState reloading broken rn but pushing changes to see if anyone can fix**

* Human... I remember you
<r>disabling reloading substates cuz it broke...<r>

* <y>forgor to edit assets global.hx<y>

* lemme see

* kk

* opa

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 01:46:42 +02:00
bd79dd2e39 Week6 pixel fix + more syntax cleanup (#662)
* Fixed some issues with antialiasing not being set

like wtf man why isn't it set do false in da code

* oops i forgor i was testing smth lol

* forcing the note sprites to be non aliased

* fine lmao

Co-authored-by: Til <89487150+TechnikTil@users.noreply.github.com>

* my take

* yes i will shut the fuck up now

---------

Co-authored-by: Til <89487150+TechnikTil@users.noreply.github.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-04 21:51:54 +02:00
Frakits 2c6b28fc09 SIIGHHH 2025-06-26 23:01:59 +03:00
⍚~Nex 2a44c5ca1d replacing the discord rpc 2025-06-15 19:08:28 +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
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
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
Ne_Eo 079ea7e7b3 Fix small bug 2025-03-06 01:47:48 +01:00
NyxieFemboy 8f4394b6ad made alt notes actually play alt miss animations 2025-02-18 14:41:02 -05:00
Ne_Eo f6891dda52 Work on alphabet editor 2025-01-19 18:14:17 +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
SrtHero278 44bb604b93 more temp chars 2024-12-24 12:30:17 -08:00
SrtHero278 c9e47516f3 a few more chars and alphabet errors 2024-12-24 10:48:24 -08:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +01:00
Furo c097294aef skewing is usable now 2024-12-01 16:34:04 +01:00
Ne_Eo 80ef390095 Merge branch 'main' into translations-system 2024-11-29 22:06:37 +01:00
Ne_Eo 0d357171cf Merge branch 'main' into new-editors 2024-11-29 22:05:11 +01:00
Ne_Eo cd0f06f448 Merge remote-tracking branch 'upstream/main' 2024-11-29 22:02:37 +01:00
SrtHero278 7568335443 modify ref scaling a bit
also you guys forgot to set the fps on bold
2024-11-28 11:35:23 -08:00
SrtHero278 8378ff2b56 finished outlines
might need more testing
2024-11-28 11:09:45 -08:00
f6710550c8 allow me to use my mouse scroll wheel in the mod menu (+ more menus) (#450)
* Update ModSwitchMenu.hx

* fixed

* adding wheel to more menus

* forgor pixel

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-11-24 17:32:40 +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
NyxieFemboyandGitHub 9d51b9db8f fixes to character offsets/indices (Not meant to reflect base game) (#388) 2024-11-14 02:15:12 +01:00
Ne_EoandSrtHero278 de65df8b31 Working on outlines
Co-Authored-By: SrtHero278 <93018286+SrtHero278@users.noreply.github.com>
2024-11-04 17:18:41 +01:00
Ne_Eo 82178e37a4 Merge branch 'main' into translations-system 2024-11-03 22:46:36 +01:00
⍚~Nex 4a1bc2c147 Merge branch 'main' into base-fnf-port-remake 2024-11-03 21:39:23 +01:00
Ne_Eo fd8b38930c Merge remote-tracking branch 'upstream/main' 2024-11-03 20:01:10 +01:00
SrtHero278 7f8fee5ea3 ok i did the offsetting 2024-11-03 07:17:33 -08:00
SrtHero278 834328d2b9 mirgrated to the actual engine and new spritesheet
TODO: proper offsetting i dont feel like it right nowwwwwwwwwwwwwwwwwwwwwwwww
2024-11-02 21:35:51 -07:00
⍚~Nex aae4dee6cb removing useless examples as theyre on the website
check the website!!

placed the github docs link as it redirects to the actual website link just in case we'll ever change the website's link or anything else happens idk
2024-10-30 19:46:45 +01:00
SrtHero278 fb5540638e component specific color modes 2024-10-27 10:19:06 -07:00
Ne_Eo 5a48b51238 Merge branch 'main' into translations-system 2024-10-23 20:56:15 +02:00
Ne_Eo 2f63f8ac41 Remove TITLESCREEN_XML define 2024-10-23 19:21:14 +02:00