diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 89d290692..36362fc9e 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenArena" AppFullName=ws.openarena.sdl # Application version code (integer) -AppVersionCode=08838 +AppVersionCode=08839 # Application user-visible version name (string) -AppVersionName="0.8.8.38" +AppVersionName="0.8.8.39" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -20,13 +20,13 @@ AppVersionName="0.8.8.38" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!Game data|obb:main.8828|https://sourceforge.net/projects/libsdl-android/files/OpenArena/data-0.8.8.28.zip/download^!Game logic|:baseoa/pak7-android.pk3:pak7-android.pk3" +AppDataDownloadUrl="!Game data|mnt:main.8839|obb:main.8828|https://github.com/pelya/openarena-engine/releases/download/0.8.8.39/data-0.8.8.zip|https://sourceforge.net/projects/libsdl-android/files/OpenArena/data-0.8.8.28.zip/download^!Game logic|:baseoa/pak7-android.pk3:pak7-android.pk3" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="libsdl-DownloadFinished-1.flag" +DeleteFilesOnUpgrade="libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-0.flag baseoa" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ @@ -180,10 +180,10 @@ AppUsesMultitouch=y AppRecordsAudio=y # Application needs read/write access SD card. Always disable it, unless you want to access user photos and downloads. (y) / (n) -AccessSdCard=y +AccessSdCard= # Application needs to read it's own OBB file. Enable this if you are using Play Store expansion files. (y) / (n) -ReadObbFile= +ReadObbFile=y # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) AccessInternet=y @@ -270,7 +270,7 @@ APP_PLATFORM= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi-v7a arm64-v8a x86 x86_64 MultiABI='armeabi-v7a x86 arm64-v8a x86_64' -#MultiABI='arm64-v8a' +MultiABI='arm64-v8a' # Optional shared libraries to compile - removing some of them will save space # MP3 patents are expired, but libmad license is GPL, not LGPL diff --git a/project/jni/application/openarena/CreateOBB.sh b/project/jni/application/openarena/CreateOBB.sh new file mode 100755 index 000000000..ecd53fb46 --- /dev/null +++ b/project/jni/application/openarena/CreateOBB.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "Create directory data/baseoa and put your .pk3 files there" + +jobb -pn ws.openarena.sdl -pv 8839 -d ./data -o main.8839.ws.openarena.sdl.obb + +[ -n "$1" ] && { + adb shell mkdir -p /sdcard/Android/obb/ws.openarena.sdl + adb push main.8839.ws.openarena.sdl.obb /sdcard/Android/obb/ws.openarena.sdl/ +} diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 00a701570..145388d84 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 00a701570223549013ad88c3d65cce5becf96a72 +Subproject commit 145388d845e9a85e278bed9e16b0d3e19ca05a83 diff --git a/project/jni/application/openarena/project.patch b/project/jni/application/openarena/project.patch index f52cd188a..9fd7f545d 100644 --- a/project/jni/application/openarena/project.patch +++ b/project/jni/application/openarena/project.patch @@ -10,11 +10,3 @@ index 7956ad1..37b9de5 100644 -@@ -47,7 +47,6 @@ - - - -- - - - diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 3cd271675..9c194fb52 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 3cd2716756a134904c72d177d020e567e657732b +Subproject commit 9c194fb526ebfb8e7c92de57bffb54c06aab88d4