diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0e823c0ffd..50b6a5c44a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -38,12 +38,12 @@ jobs:
# - name: Tar files
# run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
- name: Uploading artifact (executable)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine (Executable Only)
path: export/release/linux/bin/CodenameEngine
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine
path: export/release/linux/bin/
@@ -83,7 +83,7 @@ jobs:
needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -110,7 +110,7 @@ jobs:
# - name: Tar files
# run: tar -zcvf CodenameEngine.tar.gz -C export/debug/linux/bin .
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine Debug
path: export/debug/linux/bin/
@@ -140,4 +140,4 @@ jobs:
# key: cache-build-linux-debug
# path: |
# .haxelib/
- # export/debug/linux/obj/
\ No newline at end of file
+ # export/debug/linux/obj/
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5e8bbdd236..db7aec27c2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,10 +8,10 @@ jobs:
build:
name: Mac OS Build
permissions: write-all
- runs-on: macos-14
+ runs-on: macos-26
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -31,16 +31,16 @@ jobs:
haxe -cp commandline -D analyzer-optimize --run Main setup -s
- name: Building the game
run: |
- arch -x86_64 haxelib run lime build mac
+ haxelib run lime build mac
- name: Tar files
run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
- name: Uploading artifact (executable)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine (Executable Only)
path: export/release/macos/bin/CodenameEngine.app/Contents/MacOS/CodenameEngine
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine
path: CodenameEngine.tar.gz
@@ -76,11 +76,11 @@ jobs:
debug_build:
name: Mac OS Debug Build
permissions: write-all
- runs-on: macos-14
+ runs-on: macos-26
needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -100,11 +100,11 @@ jobs:
haxe -cp commandline -D analyzer-optimize --run Main setup -s
- name: Building the game
run: |
- arch -x86_64 haxelib run lime build mac -debug
+ haxelib run lime build mac -debug
- name: Tar files
run: tar -zcvf CodenameEngine.tar.gz -C export/debug/macos/bin .
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine Debug
path: CodenameEngine.tar.gz
@@ -134,4 +134,4 @@ jobs:
# key: cache-build-mac-debug
# path: |
# .haxelib/
- # export/debug/macos/obj/
\ No newline at end of file
+ # export/debug/macos/obj/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d84660ae02..ee3b558674 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,10 +21,10 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Download Windows Full Build
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: windows.yml
name: Codename Engine
@@ -32,7 +32,7 @@ jobs:
allow_forks: false
- name: Download Windows Executable
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: windows.yml
name: Codename Engine (Executable Only)
@@ -40,7 +40,7 @@ jobs:
allow_forks: false
- name: Download Mac OS Full Build
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: macos.yml
name: Codename Engine
@@ -48,7 +48,7 @@ jobs:
allow_forks: false
- name: Download Mac OS Executable
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: macos.yml
name: Codename Engine (Executable Only)
@@ -56,7 +56,7 @@ jobs:
allow_forks: false
- name: Download Linux Full Build
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: linux.yml
name: Codename Engine
@@ -64,7 +64,7 @@ jobs:
allow_forks: false
- name: Download Linux Executable
- uses: dawidd6/action-download-artifact@v6
+ uses: dawidd6/action-download-artifact@v8
with:
workflow: linux.yml
name: Codename Engine (Executable Only)
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1d6ced88db..75f642e607 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -33,14 +33,14 @@ jobs:
run: |
haxelib run lime build windows
- name: Uploading artifact (executable)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine (Executable Only)
path: |
export/release/windows/bin/CodenameEngine.exe
export/release/windows/bin/lime.ndll
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine
path: export/release/windows/bin
@@ -80,7 +80,7 @@ jobs:
needs: build # since its low priority, it'll run after, so actions will concentrate first on normal builds
steps:
- name: Pulling the new commit
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Setting up Haxe
uses: krdlab/setup-haxe@v2
with:
@@ -103,7 +103,7 @@ jobs:
run: |
haxelib run lime build windows -debug
- name: Uploading artifact (entire build)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v7
with:
name: Codename Engine Debug
path: export/debug/windows/bin
@@ -133,4 +133,4 @@ jobs:
# key: cache-build-windows-debug
# path: |
# .haxelib/
- # export/debug/windows/obj/
\ No newline at end of file
+ # export/debug/windows/obj/
diff --git a/README.md b/README.md
index 8b820b1a37..49917dc048 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ The engine uses [HaxeFlixel](https://haxeflixel.com/) and it mainly features:
---
> [!NOTE]
-> Codename Engine as for now supports **Windows x64**, **Mac OS x64** and **Linux x64**.
+> Codename Engine as for now supports **Windows x64**, **Mac OS Universal** and **Linux x64**.
> More platforms will soon come, stay tuned!
> - [ ] **Web (HTML5) Support**
> - [ ] **Mobile Support**
diff --git a/building/libs.xml b/building/libs.xml
index bccaca270e..370981d599 100644
--- a/building/libs.xml
+++ b/building/libs.xml
@@ -13,13 +13,13 @@
-
+
-
+
diff --git a/project.xml b/project.xml
index abd8dd353c..e4f4a9dc75 100644
--- a/project.xml
+++ b/project.xml
@@ -24,7 +24,7 @@
-
+
diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx
index 044c5ae7a6..a78836512a 100644
--- a/source/funkin/backend/system/Main.hx
+++ b/source/funkin/backend/system/Main.hx
@@ -24,8 +24,8 @@ import openfl.utils.AssetLibrary;
import sys.FileSystem;
import sys.io.File;
#if android
-import android.content.Context;
-import android.os.Build;
+import extension.androidtools.content.Context;
+import extension.androidtools.os.Build;
#end
class Main extends Sprite
diff --git a/source/funkin/game/cutscenes/VideoCutscene.hx b/source/funkin/game/cutscenes/VideoCutscene.hx
index 0e8fbe7449..f979376f77 100644
--- a/source/funkin/game/cutscenes/VideoCutscene.hx
+++ b/source/funkin/game/cutscenes/VideoCutscene.hx
@@ -60,15 +60,12 @@ class VideoCutscene extends Cutscene {
add(video = new FlxVideoSprite());
video.antialiasing = true;
- #if (hxvlc < version("2.0.0"))
- video.autoPause = false; // Imma handle it better inside this class, mainly because of the pause menu - Nex
- #end
video.bitmap.onEndReached.add(close);
video.bitmap.onFormatSetup.add(function() if (video.bitmap != null && video.bitmap.bitmapData != null) {
final width = video.bitmap.bitmapData.width;
final height = video.bitmap.bitmapData.height;
final scale:Float = Math.min(FlxG.width / width, FlxG.height / height);
- video.setGraphicSize(Std.int(width * scale), Std.int(height * scale));
+ video.setGraphicSize(width * scale, height * scale);
video.updateHitbox();
video.screenCenter();
});
@@ -103,7 +100,7 @@ class VideoCutscene extends Cutscene {
FlxTween.tween(loadingBackdrop, {alpha: 1}, 0.5, {ease: FlxEase.sineInOut});
Main.execAsync(function() {
- if (video.load(localPath)) new FlxTimer().start(0.001, function(_) {
+ if (video.load(localPath)) FlxTimer.wait(0.001, function() {
mutex.acquire(); onReady(); mutex.release();
});
else { mutex.acquire(); close(); mutex.release(); }
@@ -203,18 +200,6 @@ class VideoCutscene extends Cutscene {
}
}
- #if (hxvlc < version("2.0.0"))
- @:dox(hide) override public function onFocus() {
- if(FlxG.autoPause && !paused) video.resume();
- super.onFocus();
- }
-
- @:dox(hide) override public function onFocusLost() {
- if(FlxG.autoPause && !paused) video.pause();
- super.onFocusLost();
- }
- #end
-
public override function pauseCutscene() {
video.pause();
super.pauseCutscene();