Merge branch 'AP-CustomEx' of https://github.com/Z11Coding/Mixtape-Engine-Rework into AP-CustomEx

Author: Yuta12342

.github/workflows/main.yml

@@ -7,9 +7,9 @@ name: Build
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ main, Archipelago ]
+    branches: [ main, Archipelago, AP-CustomEx ]
   pull_request:
-    branches: [ main, Archipelago ]
+    branches: [ main, Archipelago, AP-CustomEx ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

Project.xml

@@ -136,15 +136,15 @@
 
 	<!-- _______________________________ Libraries ______________________________ -->
 
-	<haxelib name="flixel" version="5.6.1"/>
+	<haxelib name="flixel" version="5.6.2"/>
 	<haxelib name="flixel-addons" version="3.3.2"/>
 	<haxelib name="tjson" version="1.4.0"/>
 	<haxelib name="noisehx" />
 
 	<!--Mixtape stuff needed-->
 	<haxelib name="openfl" /> <!-- Game engine backend -->
-	<!-- <haxelib name="openflCamera" />
-	<haxelib name="openflMicrophone" /> -->
+	<!--haxelib name="openflCamera" />
+	<haxelib name="openflMicrophone" /-->
 	<haxelib name="haxeui-core" /> <!-- UI framework -->
 	<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
 	<haxelib name="flixel-text-input" /> <!-- Improved text field rendering for HaxeUI -->
@@ -158,7 +158,7 @@
 	<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
 	<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.1.3"/>
 	<haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="2.0.1"/>
-	<haxelib name="hxdiscord_rpc" version="1.3.0" if="DISCORD_ALLOWED"/>
+	<haxelib name="hxdiscord_rpc" version="1.2.4" if="DISCORD_ALLOWED"/>
 	<haxelib name="flxanimate"/>
 	<haxelib name="hxpy" if="PYTHON_ALLOWED" />
 

setup/unixLinux.sh

@@ -15,7 +15,7 @@ haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
-haxelib install hxdiscord_rpc 1.3.0
+haxelib install hxdiscord_rpc 1.2.4
 haxelib install hxvlc 2.0.1 --skip-dependencies
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1

setup/unixMac.sh

@@ -15,7 +15,7 @@ haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
-haxelib install hxdiscord_rpc 1.3.0
+haxelib install hxdiscord_rpc 1.2.4
 haxelib install hxvlc 2.0.1 --skip-dependencies
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1

setup/windows.bat

@@ -11,7 +11,7 @@ haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
-haxelib install hxdiscord_rpc 1.3.0
+haxelib install hxdiscord_rpc 1.2.4
 haxelib install hxvlc 2.0.1 --skip-dependencies
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1

source/managers/FreeplayManager.hx

@@ -101,8 +101,6 @@ class FreeplayManager {
         }
         #else
         return switch (instance != null && instance.isType(FreeplayManager, true)) {
-
-            eaww
             case true:
                 trace("Using existing FreeplayManager instance.");
                 if (ensureLoaded) instance.reloadFreeplay(true);

source/psychlua/WindowFunctions.hx

@@ -9,6 +9,7 @@ class WindowFunctions
 		var lua = funk.lua;
 		var game:PlayState = PlayState.instance;
 
+		#if windows
 		Lua_helper.add_callback(lua, "setWindowOppacity", function(num:Float) {
 			CppAPI.setWindowOppacity(num);
 		});
@@ -40,7 +41,7 @@ class WindowFunctions
 		Lua_helper.add_callback(lua, "windowX", function() {
 			return Window.x;
 		});
-		
+
 		Lua_helper.add_callback(lua, "windowY", function() {
 			return Window.y;
 		});
@@ -56,12 +57,12 @@ class WindowFunctions
 		Lua_helper.add_callback(lua, "windowTitle", function() {
 			return Window.title;
 		});
-		
+
 		Lua_helper.add_callback(lua, "windowReset", function() {
 			WindowUtils.resetTitle();
 			Window.reset();
 		});
-		
+
 		Lua_helper.add_callback(lua, "windowSetPos", function(x:Int, y:Int) {
 			Window.setPos(x, y);
 		});
@@ -89,5 +90,6 @@ class WindowFunctions
 		Lua_helper.add_callback(lua, "setTransparency", function(color:Int, ?winName:String) {
 			CppAPI.setTransparency(winName, color);
 		});
+		#end
 	}
-}
+}