diff --git a/.gitmodules b/.gitmodules index 3d766dc76..541588bd4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,7 +44,7 @@ [submodule "project/jni/application/openttd/src"] path = project/jni/application/openttd/src url = https://github.com/pelya/openttd-android.git - branch = 12 + branch = 13 update = merge [submodule "project/jni/application/uae4all2"] path = project/jni/application/uae4all2 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 8e43ab026..3ab8afe80 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=1300116 +AppVersionCode=1340120 # Application user-visible version name (string) -AppVersionName="13.0.rev116" +AppVersionName="13.4.rev120" # 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 @@ -22,7 +22,7 @@ AppVersionName="13.0.rev116" # 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-13.0-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!!!MIDI music support|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-13.4-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!!!MIDI music support|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz^!!Fonts|openttd-fonts.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 c9de76f21..176942d69 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -2,7 +2,7 @@ set -e -VER=13.0-0 +VER=13.4-0 ARCH=$1 ANDROID_DATA_FULLPATH=$(realpath ./AndroidData/)