Commit Graph
50 Commits
Author SHA1 Message Date
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02: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
⍚~Nex 066dc7d57a Merge remote-tracking branch 'public/main' 2025-07-06 04:40:21 +02:00
b41602ff37 extend <solid> functionality in stages (#633)
* extend <solid> functionality in stages

adds support for scroll(x/y), zoomfactor, and alpha to solids made in a stage xml  . because Why not

* better

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 03:23:32 +02: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
Ne_Eo a6c99754fd Added some documentation 2024-12-16 03:53:42 +01:00
Ne_Eo a20020bc3c Merge remote-tracking branch 'upstream/main' 2024-12-16 03:13:23 +01:00
6e2877c2a9 Added flipX and flipY to loadSpriteFromXML() (#487)
Fixes #478

* Added flipX and flipY to loadSpriteFromXML()

why was this not already implemented? Nevermind I'm pretty sure it's because parseBool isn't a thing

* WHOOPS

gotta update my heckin repo

* Wow neo is good at simplifying stuff

rip parseBool but HAXE MAKE IT A THING

* sigma

¯\_(ツ)_/¯

* Allow for flipx and flipy

as opposed to flipX and flipY (cammel text)

* gaming chair

🪑

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2024-12-14 15:47:47 +01:00
Ne_Eo 012c8f76fc Merge remote-tracking branch 'upstream/main' 2024-12-09 22:52:29 +01:00
⍚~Nex f6deda2c84 addAnim for FunkinSprite + better names
so u dont have to manually add based if atlas or sparrow or else

this behaves as both addByPrefix and addByIndices and like the xml animations
2024-12-08 21:35:39 +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
⍚~Nex 4c94bb61a7 Merge branch 'main' into base-fnf-port-remake 2024-10-21 17:50:30 +02:00
Ne_Eo 6636bffc42 Merge branch 'main' into translations-system 2024-10-18 03:05:11 +02:00
Ne_Eo 5801ed0840 Merge branch 'main' into new-editors 2024-10-18 03:02:13 +02:00
Ne_Eo 9640c3e17e Merge remote-tracking branch 'upstream/main' 2024-10-18 02:53:24 +02:00
Ne_Eo 2bfc58ccb0 Some optimizations
I wish there was a cleaner way of doing this
2024-10-18 02:50:41 +02:00
⍚~NexandNe_Eo 682358c93a characters xml events + script extensions too!
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-10-18 01:17:09 +02:00
Ne_Eo 2570d68f68 Optimizations 2024-10-14 14:41:39 +02:00
Ne_Eo 8ce4c8ab25 Merge branch 'main' into translations-system 2024-09-22 15:21:17 +02:00
Ne_Eo 17ce1f147c Merge branch 'main' into new-editors 2024-09-14 23:49:06 +02:00
⍚~Nex bc3e1f1c8c Merge branch 'main' into base-fnf-port-remake 2024-09-14 16:19:13 +02:00
⍚~Nex cecdd05322 Merge remote-tracking branch 'public/main' 2024-09-14 16:03:38 +02:00
⍚~Nex f281cc6ee4 forgor to remove this 2024-09-10 23:11:39 +02:00
⍚~Nex dd4e8962d8 better default forced
FINALLY i had the best idea to fix this shit
2024-09-10 22:59:45 +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
Ne_Eo c9761f9aed Merge remote-tracking branch 'upstream/main' 2024-08-27 03:48:18 +02:00
Ne_Eo 1b55beffe9 Added number ranges for indices (1..6) 2024-08-27 02:17:35 +02:00
Ne_Eo ffcc9e7476 Optimizations 2024-08-02 23:42:42 +02:00
NeeEoo 4ca8d66aa6 Stage Editor now recognizes unknown elements
Added a unknown element editor
Added angle to sprites and characters
2024-04-16 17:54:17 +02:00
NeeEoo daeae7a004 Added stage saving 2024-04-16 14:32:23 +02:00
NeeEoo 2164131271 Merge branch 'main' into translations-system 2024-04-12 12:18:51 +02:00
NeeEoo 2f552ae519 Fix bug with xml animations 2024-04-12 01:35:13 +02:00
NeeEoo 070db1c2bd Merge branch 'main' into translations-system 2024-04-11 14:30:58 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo d955e00ece Cleaned up Warning And Error Code 2024-04-10 16:37:19 +02:00
NeeEoo 7b279bfed0 Small cleanup 2024-04-05 20:25:10 +02:00
NeeEoo f8b20774e3 Remove useless indentation 2024-03-16 21:15:18 +01:00
⍚~NexandNe_Eo 9ca7f01866 finalizing the dialogue system 11
more stuff and text formats!

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
2024-02-27 01:50:21 +01:00
⍚~Nex 6917828cf9 dialogues stuff & porting WIP 2
kinda rushed today sorryyy
2024-02-17 19:08:18 +01:00
⍚~Nex 778de6bbc6 dialogues rewrites & more week 6 porting WIP 2024-02-17 04:03:11 +01:00
6e23da8e86 Add more stuff from the OG game and more PART 1 (#228)
* senpai fucking dies

* final flash fadeout

* made cutscene not play on restart

* winter horrorland + fixes

* fix for pixel perfect shader

* trail + fixes

* better + shaking

last update about it, i swear

* never fucking mind + repacks + accuracy

* more fixes + chromatic aberration

* i hate how pixel shader fucks everything up

* aberration in the cutscene & its cool twitch

* camera beats when twitching

* tank stuff pt1

now the cutscenes look 99% like og (still gotta freeze the stage animated sprites n stuff)
PS: Deleting the lipSycn function in ugh and guns cutscenes cause its not needed + sometimes breaks the animations so lets just leave it in stress only like it was in og

* week 5 completed + retrocompatibility with altanim

now chrima parents work

* philly train

* gameplay shaders option

better adding it now

* tank stuff pt2

* blue balled text (death counter)

* winter horrorland better rework WIP

colored vignette usable by everyone (you can change its color, amount and strength)
wip cuz i wanna edit the amount/strength based on the zoom, i'll do later, now i dont have time gotta do christmas irl stuff yay

* winter horrorland better rework completed

* seen cutscene variable

finally

* even better cutscenes

* oops

* tank stuff pt3

* tank stuff pt4

WIP running tanks

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>

* tankstuff pt4.5

imma check tmr why do some tankmen spawn too much up

* tank stuff pt4.75

* dumb

* tank stuff pt 4.9

* type on xml sprite type fix and more

Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>

---------

Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com>
Co-authored-by: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
2024-02-04 00:54:00 -07:00
NeeEoo 87bd2195e0 Merge remote-tracking branch 'dev/main' 2023-07-17 10:01:30 +02:00
NeeEoo 9f546f87f6 Added support for alpha in stage xmls 2023-07-15 16:26:57 +02:00
lunarcleint de02ccc18c adding anims works now (+editing ui) 2023-07-10 19:41:53 -07:00
lunarcleint 8a464196be add anim but dont work 2023-07-10 00:05:11 -07:00
lunarcleint 48a1f5bf77 Character editor work in progress i think pls test 2023-07-09 15:32:39 -07:00
Yoshman29 06828cade7 time to break your mods again for ease of use 2023-04-18 02:13:04 +02:00