Commit Graph
432 Commits
Author SHA1 Message Date
Ralty e4be3bd427 Merge branch 'Time-Signature-Changes' into new-conductor
# Conflicts:
#	.gitignore
#	source/funkin/backend/FunkinSprite.hx
#	source/funkin/backend/chart/ChartData.hx
#	source/funkin/backend/chart/EventsData.hx
#	source/funkin/backend/system/Conductor.hx
#	source/funkin/backend/utils/CoolUtil.hx
#	source/funkin/editors/charter/Charter.hx
#	source/funkin/editors/charter/CharterEvent.hx
#	source/funkin/editors/charter/CharterEventScreen.hx
#	source/funkin/editors/charter/CharterMetaDataScreen.hx
#	source/funkin/editors/charter/SongCreationScreen.hx
#	source/funkin/game/PlayState.hx
2025-07-16 19:27:05 +07: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
Ralty 1a66b7109c Merge remote-tracking branch 'upstream/main' into pr/397 2025-07-05 18:23:41 +07: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
Ralty c53a276e99 Merge remote-tracking branch 'upstream/main' into pr/397 2025-06-30 22:34:03 +07:00
⍚~Nex 2a44c5ca1d replacing the discord rpc 2025-06-15 19:08:28 +02:00
Ne_Eo a6fcb3d237 Merge branch 'main' into pr/397 2025-06-06 20:39:24 +02: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 a7415783bc Merge branch 'main' into pr/397 2025-05-05 15:38:45 +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
EfanzeDevandGitHub ca60663ec8 Winter Horrorland Linux Fix (Attempt 2) (#608)
* Winter Horrorland Linux Fix

* Fixed Winter Horrorland searching for char Monster-christmas (which technically doesn't exist on platforms other than windows due to capitalisation fuckery

* Winter Horrorland Linux Fix (Attempt 2)

* Fixed Winter Horrorland searching for char Monster-christmas (which technically doesn't exist on platforms other than windows due to capitalisation fuckery), this time using the original chart format.
2025-04-08 18:16:53 +02:00
💜 Rodney, An Imaginative Furball 💙andGitHub 34a037ab08 Why is this even here? (#609) 2025-04-08 18:02:22 +02: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
Ne_Eo c81aaf171a Optimize images 2025-03-01 19:24:49 +01:00
⍚~Nex 2227231264 Merge branch 'main' into pr/397 2025-02-25 19:38:41 +01:00
NyxieFemboy 8f4394b6ad made alt notes actually play alt miss animations 2025-02-18 14:41:02 -05:00
NyxieFemboy 3250cdb436 I think this should be everything? 2025-02-18 13:37:49 -05:00
TheZoroForce240 cb4a95678c Negative and decimal support for event numbers (and some other changes) 2025-02-02 09:48:11 +00:00
TheZoroForce240 3e13bf50c6 Continuous bpm change event, lots of other reworks and fixes 2025-02-01 21:13:46 +00:00
⍚~Nex 97a3a30aa9 more cutscene fixes 2025-01-23 00:43:49 +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 0e47728d0f Merge branch 'main' into pr/397 2025-01-10 16:33:08 +01:00
RaltyandNyxieFemboy dca41cfbc2 Merge pull request #1 from Raltyro/Continuous-Tempo-Change
Continuous Tempo Change (Thank you Ralty, Im sorry Im still learning this stuff)
2025-01-10 02:40:43 -05:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +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 2236a156fb Merge branch 'main' into pr/397 2024-11-22 03:33:08 +01:00
Ne_Eo 79dae9ed61 Added Event UI Scripts 2024-11-19 20:20:42 +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
b1b1663f5c Event based dialogue handling (#443)
* Event based dialogue handling

* better imo

* typo

* Small script example

new script by NexIsDumb

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-11-14 01:29:12 +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
⍚~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
Ne_Eo f0f90ba6ff Cleaning up intensive blur shader 2024-10-28 23:51:19 +01:00
Ne_Eo d6d5b951c5 Cleaning up shader 2024-10-28 23:47:16 +01:00
Ne_Eo d697f1e218 Merge remote-tracking branch 'upstream/main' 2024-10-28 23:31:17 +01:00
Ne_Eo 99fb9b48e5 Optimized blur shader 2024-10-27 23:45:53 +01:00
Ralty daf3179f79 Conductor Final Continuous Tempo & Time Sigs 2024-10-25 19:14:56 +07:00
Ne_Eo 2f63f8ac41 Remove TITLESCREEN_XML define 2024-10-23 19:21:14 +02:00
⍚~Nex ca6c2514ee bruh 2024-10-21 18:11:34 +02:00