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
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
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
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
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
⍚~Nex and Ne_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
TheZoroForce240
dcbf9d74ad
Merge branch 'new-editors' into zoro-charterstuffs
2024-10-14 22:06:43 +01:00
⍚~Nex
15a18bb3da
importable scripts through stage.xml + new call
...
extensions feature
2024-09-18 16:10:19 +02:00
⍚~Nex
bc3e1f1c8c
Merge branch 'main' into base-fnf-port-remake
2024-09-14 16:19:13 +02:00
TheZoroForce240
30a84774a8
Merge branch 'new-editors' into zoro-charterstuffs
2024-09-12 21:14:06 +01:00
Ne_Eo
48758c8176
Fix camera pausing + Fixes #317
2024-09-02 19:00:16 +02:00
⍚~Nex
500cf98e0c
editable static costants!
...
for scripts :D
2024-08-31 02:31:05 +02:00
TheZoroForce240
bef678a3a8
multikey anim support on pixel notes
2024-08-28 12:34:49 +01:00
TheZoroForce240
296e90481d
pixel note fixes for scale/mulitkey
2024-08-28 11:37:11 +01:00
⍚~Nex
49db1a089a
hell, here we are again
2024-08-27 17:46:44 +02:00
NeeEoo
f8b20774e3
Remove useless indentation
2024-03-16 21:15:18 +01:00
a2ebb51dca
Pixel Note Splashes in Week 6 ( #238 )
...
* pixel note splashes
* tyy!!
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com >
2024-02-06 11:19:22 +01:00
⍚~Nex
9d2bf7a0c6
jeff stupid lines
...
19 is wild bro😭
2024-02-04 23:12:11 +01:00
NeeEoo
e9c9c2b04c
Fixed Pixel Song Issues
2023-05-30 02:15:36 +02:00
NeeEoo
85cdfdeb10
Spaces To Tabs
2023-04-22 12:15:49 +02:00
Yoshman29
fdf0d5b3cc
fuck new assets lmao
...
This reverts commit f37d31ab86
2023-04-14 17:20:28 +02:00
Yoshman29
f37d31ab86
new assets (NOT FUNCTIONAL! FOR REVIEW PURPOSES)
2023-04-14 16:13:30 +02:00
Yoshman29
af89443188
fixes
2023-03-18 02:53:08 +01:00
Yoshman29
5b963fb7f8
fixes
2023-02-20 18:00:38 +01:00
Yoshman29
2d1980ac84
week 6 effect can now be turned off
2022-12-21 13:19:21 +01:00
Yoshman29
e9654cbc89
game over
2022-12-05 22:55:56 +01:00
Yoshman29
a16608448d
post stuff!! also now every asset can be animated
2022-11-19 15:23:00 +01:00
Yoshman29
e782ebe91b
script callback names now makes sense!
2022-11-17 23:21:57 +01:00
Yoshman29
14007b448c
sustains are centered now so stfu
2022-11-10 21:30:16 +01:00
Yoshman29
94d2a3c30d
hehehehe
2022-11-09 23:19:40 +01:00
Yoshman29
75f7bb378b
week 7 stuff + video cutscenes
2022-11-06 02:32:35 +01:00
Yoshman29
b9aafdc3e9
YO ITS ME THORNS!!!
2022-11-05 23:37:36 +01:00
Yoshman29
5e01430006
accuracy pt1
2022-11-05 22:40:52 +01:00
Yoshman29
2a39887f16
fixed
2022-11-05 21:43:00 +01:00
Yoshman29
bfd3043a1f
wizard engine??
2022-11-05 21:04:02 +01:00
Yoshman29
f854f88923
week 6 pause!!
2022-11-05 19:12:16 +01:00
Yoshman29
51784fa0d1
senpai!!
2022-11-05 04:00:28 +01:00
Yoshman29
ea8e2ba35d
some hscript stuff!!
2022-11-04 19:55:29 +01:00
Yoshman29
ccf0c833b2
push
2022-11-04 15:12:58 +01:00
Yoshman29
930d6833ef
week 6 have started development
2022-11-04 04:06:31 +01:00
Ralty