diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 19e1680b6..247314095 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -272,7 +272,8 @@ APP_PLATFORM= # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi-v7a arm64-v8a x86 x86_64 -MultiABI='arm64-v8a' +MultiABI='armeabi-v7a arm64-v8a x86 x86_64' +#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/engine b/project/jni/application/openarena/engine index 6b5ccdb73..29e6ec27b 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 6b5ccdb73e544a22e5d9770362685a1b222d8e04 +Subproject commit 29e6ec27b8a871ae798de6422bdcc758474e9aba diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 8ef8138ac..129a3cd43 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,17 +7,19 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=1112107 +AppVersionCode=1112108 # Application user-visible version name (string) -AppVersionName="1.11.2.rev107" +AppVersionName="1.11.2.rev108" # 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 # If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as binary BLOB to the application dir and not unzipped # If the URL does not contain 'http://' or 'https://', it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by the build system -# 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 specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for the obb file +# You can mount expansion files created with jobb tool if you put 'mnt:main.12345' or 'mnt:patch.12345' +# The mount directory will be returned by calling getenv("ANDROID_OBB_MOUNT_DIR") # 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="!!Data files|openttd-data-1.11.2-2.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|https://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz|https://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz|https://sourceforge.net/projects/libsdl-android/files/openttd-fonts.zip.xz" @@ -183,13 +185,16 @@ AppRecordsAudio=n AccessSdCard=n # Application needs to read it's own OBB file. Enable this if you are using Play Store expansion files. (y) / (n) -ReadObbFile= +ReadObbFile=n # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) -AccessInternet= +AccessInternet=y # Immersive mode - Android will hide on-screen Home/Back keys. Looks bad if you invoke Android keyboard. (y) / (n) -ImmersiveMode= +ImmersiveMode=y + +# Draw in the display cutout area. (y) / (n) +DrawInDisplayCutout=n # Hide Android system mouse cursor image when USB mouse is attached (y) or (n) - the app must draw it's own mouse cursor HideSystemMousePointer=y @@ -207,10 +212,11 @@ NonBlockingSwapBuffers=n # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA RedefinedKeys="LALT RETURN NO_REMAP NO_REMAP SPACE DELETE" -# Number of virtual keyboard keys (currently 6 is maximum) +# Number of virtual keyboard keys - currently 12 keys is the maximum AppTouchscreenKeyboardKeysAmount=0 -# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) +# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) + 6 additional keyboard keys +# Multitouch gestures should be moved to a separate variable, but are left here for compatibility RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE MOUSE_WHEEL_UP MOUSE_WHEEL_DOWN 1 2" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu @@ -270,7 +276,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='arm64-v8a armeabi-v7a x86 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