Commit Graph
121 Commits
Author SHA1 Message Date
Ralty cf2c3689c5 Merge branch 'main' into internal-merge
# Conflicts:
#	building/libs.xml
#	source/openfl/utils/Assets.hx
2026-03-28 17:58:25 +07:00
Ralty 491e5df430 Temporary commit 2026-03-28 17:39:06 +07:00
ItsLJcoolandGitHub a7b040152d Fixed / Refactored SysZip to actually work, and store compressed entries without uncompressing an entire zip (#761)
* well boys I fixed it. you can now have Zipped Mods!!!!!

* comment update

* quick fixes + optimizations

* fixed stream audio bug????

* found the issue ffs

* removing traces oops

* fixed videos from not being able to play. Inspired from VideoCutscene's fix for ZIP videos, and also removed that fix in favor for just fixing the issue entirely

* oop just in case no special characters that kill themself on other shit

* Implemented preloading every video (caching) when loading a ZipFolderLibrary.

Since videos have to be decompressed and be saved as a file anyways this reduces the time to do that, and what not.

* [UNTESTED] Allowed Zip Extensions for allowing any extension in the list to be passed as a `.zip`

* After some more testing loading Zip Addons works as well.

* Added the long awaited .cnemod file type!!!!! (it's just a folder with .cnemod with a .zip inside LMAO)

* Chalking up the Streamed Audio Bug to a mod issue, and also added capabilites to detect if a library is considered compressed

* Added warning to those who try to use the editor with compressed libraries

* ok instead of making it a .cnemod, the zip name will be `cnemod.zip` or what not.

* removing unnessesary traces oops

* clean Library accessor ig then

* fixed small issues and removed an idiot idea

* writing todos and fixing some context that left the room in comments

* Fixed an issue where if you had a file of 0 bytes (nothing) in a zipped library it would FUCKING CRASH the game

* Actually fixed the issue of decompressing 0 byte files

Also stopped saving the data for Folders in Zipped files, as they are 0 bytes anyways.

* Added the features that needed to exist, and removed a stupid line I saw in `ModsFolder` lol

For some reason animation offsets for characters are breaking and I can't tell if its my drive killing itself or cne so uh

* fix an issue that will force the game to crash if first ever mod being loaded is a ZipModLibrary
2026-03-15 14:24:47 +07:00
Ralty c20c29250d Fix every internal_merge issues 2026-03-01 14:15:02 +07:00
4d84e65cb5 flixel-animate implementation (#893)
* added flixel-animate to libs

* I BROKE THE OFFSETS FUCK

.

* yes it does blehtty wdym??

* Removed flxanimate entirely + Fixed transition + Fixed offsets

* Deleted caches (relaunching actions)

* frameOffset for atlases (need testing)

* useRenderTexture added to xml

* Fixed atlases for mods

* a simple redirect so old mods wont break that badly (#879)

* Update FunkinSprite.hx

* remove trace

* Fixed ghosts for atlases

* usable character editor (not entirely fixed)

* fixed zoomFactor + temp fix for atlas popping

* early structure for character editor atlas anim display

* zoomFactor for atlases

* Animate Atlas character editor previews

* FlxAnimateSettings specification

* fixed animation swapping on atlas characters

* OH YEA BABY NEW FLXANIMATE UPDATE THAT MADE CODE 50X SIMPLER **AGAIN** 💖 /pos

* Added label checkbox in Character Editor

* Fixed culling issues with FlxAnimate (fr this time)

* fixed some atlases

* HOW THE FUCK

* gf sad fix + AliasMacro (for backwards comp, manual impl for now)

* Fixed pop-ins

* Update Character.hx

* applyStageMatrix

* FlxAnimate pull request merge (empty commit)

* flixel-animate** i'm clumsy asf i meant the lib not the class name fuck

* Update libs.xml

* Merge changes from main (#892)

* repair ScriptableShader.shader = null (#877)

* optimize updateInput (#878)

* optimize updateInput

* resize optimize

* __notePerStrum optimize

* Update StrumLine.hx

* NoteGroup optimize (#881)

* NoteGroup optimize

* CoolUtil.bound faster

* makes commit with github desktop W FRAKITS

* Use fastSinCos for notes (#889)

* Update Strum.hx

* Update Strum.hx

---------

Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com>
Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com>

---------

Co-authored-by: Kolze <53307233+KolzeYT@users.noreply.github.com>
Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com>
Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com>
2026-01-28 20:29:32 +01:00
Ralty 9c7bb8f073 Aghhh variant, variation, whatever 2025-08-09 00:31:45 +07:00
FrakitsandGitHub 406f76af5d improve lagspike? 2025-08-07 23:38:31 +03:00
Ralty d2a113907a instSuffix, meta.metas for freeplay preview 2025-08-08 00:07:49 +07:00
Frakits 1716dc48ab oh yeah i almost forgot 2025-08-07 11:03:50 +03:00
Frakits 522256a3cf ok whatever 2025-08-07 10:50:54 +03:00
Frakits 3196195790 remove traces 2025-08-07 10:45:03 +03:00
Frakits 537883d2f4 FIXED!! 2025-08-06 23:38:46 +03:00
Frakits 6a1bbb72e3 warning: this crashes (on linux) 2025-08-06 23:15:53 +03:00
Ralty 6e2af842e2 sorry 2025-08-04 19:08:55 +07:00
Ralty c6a511a042 whoops 2025-08-04 19:02:10 +07:00
Ralty 38997b4765 Don't duplicate default asset library 2025-08-04 18:08:21 +07:00
HeroEyad 50aa23c797 zzz 2025-07-28 22:38:59 +03:00
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
9d1392399b Add noExtension flag to getFolderContent for cleaner Paths usage (#654)
* yeah

* Revert "yeah"

This reverts commit 5ab6ab8c7d.

* idk wtf happend

* Fixed Missing Curly Bracket

* hi

---------

Co-authored-by: Furo <furogaming9@gmail.com>
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-07-05 02:13:30 +02:00
Frakits 9db001101a [REQUIRES TESTING] removed lowercasing requirement in song parsing 2025-07-01 10:18:46 +03:00
Yoshman29 5609f18c6a Fixes for Linux systems 2025-05-11 11:15:22 +02:00
⍚~Nex fcfc7950a1 making the endingSong bool actually work
that variable has been there for 3 years btw😭
2025-05-11 02:26:11 +02:00
Ne_Eo f17d8bf072 Merge remote-tracking branch 'upstream/main' 2025-05-02 02:45:57 +02:00
Ne_Eo b5b604e580 Bug fix: Fix issues with extra libraries 2025-05-02 02:05:22 +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 1815c9d0c0 Merge branch 'main' into translations-system 2025-02-28 16:49:28 +01: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
Ne_Eo dab6a3b520 Small crash fix 2025-01-19 22:04:03 +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
⍚~Nex 5ab8a02a10 Merge remote-tracking branch 'public/main' 2025-01-03 19:18:18 +01:00
74884854ea Fixes a crash when no mod folders are founded (#515)
* Fixes a crash when no mod folders are founded

Hi

* lemme

---------

Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
2025-01-02 03:09:14 +01:00
Ne_Eo d6dc3ea232 Fix typos 2024-12-10 04:35:32 +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
⍚~Nex 759dbaed6a actually 2024-11-11 20:10:29 +01:00
StrawberrySageandGitHub 1aacf14c6b Make Paths.getAssetsRoot() return the source assets rather than the exported assets when using ./cne test (#389) 2024-11-11 20:05:52 +01:00
⍚~Nex 4a1bc2c147 Merge branch 'main' into base-fnf-port-remake 2024-11-03 21:39:23 +01:00
Ne_Eo 68c2feab37 Folder support for characters (WIP) 2024-11-01 19:47:10 +01:00
Ne_Eo de59b305cc Folder support for characters (WIP) 2024-10-26 23:46:05 +02: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