diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index afae8ea43..1513fde9c 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit afae8ea434f5028751c0a35ea842274a2b4109c4 +Subproject commit 1513fde9c83472bb1477ffc909bd2f32612ea827 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 73c359b71..13c5521b4 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=111095 +AppVersionCode=111096 # Application user-visible version name (string) -AppVersionName="1.11.0-beta1.rev95" +AppVersionName="1.11.0-beta2.rev96" # 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,7 +20,7 @@ AppVersionName="1.11.0-beta1.rev95" # 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 - 20 Mb|openttd-data-1.11.0-0.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" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.11.0-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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index dbb1b429d..f7d682385 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.0-0 +VER=1.11.0-1 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index da2947e5e..53458e55d 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit da2947e5e32b292e5f6826be59f2ecdf4ead08fe +Subproject commit 53458e55d70ba062f5d670015aee9aad8ed81ac8