From 74fcc6d134f7f37b90e2951d71fe0724aab06d9d Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 22 Dec 2024 14:11:43 +0300 Subject: [PATCH 1/7] forgor --- source/OutdatedState.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/OutdatedState.hx b/source/OutdatedState.hx index d8d8c837..a0570abe 100644 --- a/source/OutdatedState.hx +++ b/source/OutdatedState.hx @@ -45,6 +45,8 @@ class OutdatedState extends MusicBeatState warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER); warnText.screenCenter(Y); add(warnText); + + addTouchPad("NONE", "A_B"); } override function update(elapsed:Float) From 96196d8056d7ef9598bbc7e0c93e7628505c5479 Mon Sep 17 00:00:00 2001 From: Lily Date: Sun, 22 Dec 2024 14:11:58 +0300 Subject: [PATCH 2/7] not a port --- source/OutdatedState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/OutdatedState.hx b/source/OutdatedState.hx index a0570abe..24a6d8ab 100644 --- a/source/OutdatedState.hx +++ b/source/OutdatedState.hx @@ -31,7 +31,7 @@ class OutdatedState extends MusicBeatState please update to " + TitleState.updateVersion + "!\n Press B to proceed anyway.\n \n - Thank you for using the Port!"; + Thank you for using the Engine!"; } else { guh = "Sup bro, looks like you're running an \n outdated version of P-Slice Engine (" + MainMenuState.pSliceVersion + "),\n From 334785555d2603daea2926173979b17d5008db7c Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 23 Dec 2024 16:05:23 +0300 Subject: [PATCH 3/7] Update psych63.yml --- .github/workflows/psych63.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/psych63.yml b/.github/workflows/psych63.yml index 49b4712e..439172a8 100644 --- a/.github/workflows/psych63.yml +++ b/.github/workflows/psych63.yml @@ -79,7 +79,7 @@ jobs: name: P-Slice.0.6.3.windows path: export/PE0.6.3/release/windows/bin buildMac: - runs-on: macos-12 + runs-on: macos-13 steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -167,4 +167,4 @@ jobs: uses: actions/upload-artifact@v4.3.4 with: name: P-Slice.0.6.3.android - path: 'export/PE0.6.3/release/ios/build/Release-iphoneos/*.ipa' \ No newline at end of file + path: 'export/PE0.6.3/release/ios/build/Release-iphoneos/*.ipa' From e376f6e45d10ebbabec740657143e14d655ea0c4 Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 23 Dec 2024 16:17:59 +0300 Subject: [PATCH 4/7] Update psych63.yml --- .github/workflows/psych63.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/psych63.yml b/.github/workflows/psych63.yml index 439172a8..bb9ad0e3 100644 --- a/.github/workflows/psych63.yml +++ b/.github/workflows/psych63.yml @@ -123,6 +123,12 @@ jobs: haxelib setup ~/haxelib chmod +x ./setup/mobile.sh sh ./setup/mobile.sh + - name: Configure Android + run: | + haxelib run lime config ANDROID_SDK $ANDROID_HOME + haxelib run lime config ANDROID_NDK_ROOT $ANDROID_NDK_LATEST_HOME + haxelib run lime config JAVA_HOME $JAVA_HOME_17_arm64 + haxelib run lime config ANDROID_SETUP true - name: Skip SScript setup mode run: echo 'oy9:showMacroty8:loopCosti25y10:includeAllfg' >> ~/settings.cocoa - name: Create Version Tag @@ -159,7 +165,7 @@ jobs: run: haxelib run lime build Project.xml ios -nosign --app-version="4.0.0-${{ github.run_id}}" -D officialBuild - name: Make IPA run: | - cd export/release/ios/build/Release-iphoneos + cd export/PE0.6.3/release/ios/build/Release-iphoneos mkdir Payload mv *.app Payload zip -r PSliceEngine.ipa Payload From 4a217ea013fb98915ea1aff6208cdf651a3eb15e Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 23 Dec 2024 16:18:31 +0300 Subject: [PATCH 5/7] Update NativeWindow.hx --- source/lime/_internal/backend/native/NativeWindow.hx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/lime/_internal/backend/native/NativeWindow.hx b/source/lime/_internal/backend/native/NativeWindow.hx index 960391cc..4d409f53 100644 --- a/source/lime/_internal/backend/native/NativeWindow.hx +++ b/source/lime/_internal/backend/native/NativeWindow.hx @@ -305,7 +305,7 @@ class NativeWindow { if (handle != null) { - #if (!macro && lime_cffi) + #if (!macro && lime_cffi && lime >= "8.1.0") return NativeCFFI.lime_window_get_opacity(handle); #end } @@ -467,7 +467,7 @@ class NativeWindow { if (handle != null) { - #if (!macro && lime_cffi) + #if (!macro && lime_cffi && lime >= "8.1.0") NativeCFFI.lime_window_set_minimum_size(handle, width, height); #end } @@ -477,7 +477,7 @@ class NativeWindow { if (handle != null) { - #if (!macro && lime_cffi) + #if (!macro && lime_cffi && lime >= "8.1.0") NativeCFFI.lime_window_set_maximum_size(handle, width, height); #end } @@ -666,7 +666,7 @@ class NativeWindow { if (handle != null) { - #if (!macro && lime_cffi) + #if (!macro && lime_cffi && lime >= "8.1.0") NativeCFFI.lime_window_set_opacity(handle, value); #end } @@ -705,7 +705,7 @@ class NativeWindow { if (handle != null) { - #if (!macro && lime_cffi) + #if (!macro && lime_cffi && lime >= "8.1.0") NativeCFFI.lime_window_set_visible(handle, value); #end } @@ -757,4 +757,4 @@ class NativeWindow var WINDOW_FLAG_MAXIMIZED = 0x00004000; var WINDOW_FLAG_ALWAYS_ON_TOP = 0x00008000; var WINDOW_FLAG_COLOR_DEPTH_32_BIT = 0x00010000; -} \ No newline at end of file +} From bd65f16e36a732e11f04cd1531934bcca4490557 Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 23 Dec 2024 16:28:37 +0300 Subject: [PATCH 6/7] I forgor --- source/OutdatedState.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/OutdatedState.hx b/source/OutdatedState.hx index 24a6d8ab..2790a739 100644 --- a/source/OutdatedState.hx +++ b/source/OutdatedState.hx @@ -46,7 +46,9 @@ class OutdatedState extends MusicBeatState warnText.screenCenter(Y); add(warnText); + #if TOUCH_CONTROLS_ALLOWED addTouchPad("NONE", "A_B"); + #end } override function update(elapsed:Float) From 0e37df20dc5f70b02647095cdb07ea6dd747e8b8 Mon Sep 17 00:00:00 2001 From: Lily Date: Mon, 23 Dec 2024 17:16:25 +0300 Subject: [PATCH 7/7] great --- .github/workflows/psych63.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/psych63.yml b/.github/workflows/psych63.yml index bb9ad0e3..38ed72e7 100644 --- a/.github/workflows/psych63.yml +++ b/.github/workflows/psych63.yml @@ -172,5 +172,5 @@ jobs: - name: Publish Artifact uses: actions/upload-artifact@v4.3.4 with: - name: P-Slice.0.6.3.android + name: P-Slice.0.6.3.iOS path: 'export/PE0.6.3/release/ios/build/Release-iphoneos/*.ipa'