Update and Rebase Libraries to FunkinCrew's, Blend Modes, etc. - #916
Open
Raltyro wants to merge 52 commits into
Open
Update and Rebase Libraries to FunkinCrew's, Blend Modes, etc.#916Raltyro wants to merge 52 commits into
Raltyro wants to merge 52 commits into
Conversation
Raltyro
added
type:enhancement
# Conflicts: # source/funkin/editors/ui/UITextBox.hx
# Conflicts: # building/libs.xml # source/openfl/utils/Assets.hx
… fix VIDEO_CUTSCENES (#931) * Update hxvlc to 2.2.6 * Remove `arch -x86_64` as no longer needed Since `cne-lime` got rebased with FunkinCrew's, which includes Apple Silicon (ARM64) support. * Wtf * Rename **Mac OS x64** to **Mac OS Universal** in the ReadME Reason: **x64** is only powered by Intel/AMD, not ARM, so it will make the macOS users to think macOS builds still uses Intel. * Enable videos for iOS Since hxvlc 2.0.0 or newer, it fixed the video playback for iOS. * Fixed the extension-androidtools import, when using extension-androidtools 2.2.X. * Replace `start` with `wait` in `VideoCutscene.hx` * Revert * Nvm I think I found out why I guess * Will this fix some actions deprecations? * Oops * F#CK * I'm gonna lose it * I forgot again I'm going to scream into the pillow, If I keep forgetting to update those. * Update macOS version to 26 in the macOS workflow * Remove old hxvlc apis from the `VideoCutscene.hx` class, since hxvlc got updated to the latest * Fix the f#cking conflicts * Now it works --------- Co-authored-by: Ralty <78720179+Raltyro@users.noreply.github.com>
# Conflicts: # .github/workflows/linux-selfhosted.yml
Contributor
|
If my pr FunkinCrew/lime#95 (Which is from FunkinCrew's lime) will ever be merged, I could add ARM support to the Linux workflow, so it will be supported officially, but not rn though. |
Contributor
I closed it, if you want to know reason why, look through it. |
Raltyro
force-pushed
the
internal-merge
branch
6 times, most recently
from
August 4, 2026 08:01
63990cc to
af75500
Compare
# Conflicts: # .github/workflows/macos.yml # building/libs.xml # project.xml # source/funkin/backend/assets/AssetsLibraryList.hx # source/funkin/backend/assets/Paths.hx # source/funkin/backend/system/FunkinGame.hx
* Initial commit for branch * Almost done, just need to fix that weird bug where 2 views need to be present to render 3D * Small optimisations * Added temporary fix for rendering with a single view * removed myself from the authors * Removing it in fact did not break anything (removed commented out block of code) * Removed a useless variable and improved formatting on a comment * Aw dang it
Nobody use Haxe 3 to compile nor target flash for the engine anyway.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.