diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 9b7e6d480..597f84219 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 9b7e6d48040bb96250d38f9b7e006a798cfe85ad +Subproject commit 597f84219580bb77602835070d9b06306c3a3bff diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 02113650b..20040462f 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 02113650ba77fa37de58719d0aac1f17ba8ab580 +Subproject commit 20040462faf0a78ebd4b813d35127416686e65d6 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 842b71089..685e31a58 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=1112105 +AppVersionCode=1112106 # Application user-visible version name (string) -AppVersionName="1.11.2.rev105" +AppVersionName="1.11.2.rev106" # 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="1.11.2.rev105" # 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="!!Data files|openttd-data-1.11.2-1.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" +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" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=y +ResetSdlConfigForThisVersion=n # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag fonts/UnDinaruBold.ttf" +DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag ai/regression ai/stationlist" # 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/ diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index fe2f94b6d..662c1fd83 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=1.11.2-1 +VER=1.11.2-2 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip