Skip to content

Commit

Permalink
Merge branch 'pe-0.6.3-dev' into pe-0.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mcagabe19 committed Dec 23, 2024
2 parents f540eb5 + 0e37df2 commit 3a07180
Show file tree
Hide file tree
Showing 3 changed files with 772 additions and 5 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/psych63.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -159,12 +165,12 @@ 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
- name: Publish Artifact
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'
name: P-Slice.0.6.3.iOS
path: 'export/PE0.6.3/release/ios/build/Release-iphoneos/*.ipa'
3 changes: 2 additions & 1 deletion source/OutdatedState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class OutdatedState extends MusicBeatState
warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
warnText.screenCenter(Y);
add(warnText);
#if ALLOW_MOBILE_CONTROLS

#if TOUCH_CONTROLS_ALLOWED
addTouchPad("NONE", "A_B");
#end
}
Expand Down
Loading

0 comments on commit 3a07180

Please sign in to comment.