diff --git a/.gitmodules b/.gitmodules index e149568d7..97165710d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -72,7 +72,7 @@ [submodule "project/jni/application/openttd-jgrpp/src"] path = project/jni/application/openttd-jgrpp/src url = https://github.com/pelya/OpenTTD-JGR-patchpack.git - branch = jgrpp + branch = android-desktop [submodule "project/jni/application/liero/src"] path = project/jni/application/liero/src url = https://github.com/pelya/liero-android.git diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index c06f9cd6d..aba40bd70 100644 --- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD JGR" AppFullName=org.openttd.jgrpp # Application version code (integer) -AppVersionCode=033006 +AppVersionCode=033206 # Application user-visible version name (string) -AppVersionName="0.33.0" +AppVersionName="0.33.2" # 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="0.33.0" # 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-0.33.0-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-0.33.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization 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-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh index 95744876c..b6dc985bc 100755 --- a/project/jni/application/openttd-jgrpp/pack-data.sh +++ b/project/jni/application/openttd-jgrpp/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=0.32.3-0 +VER=0.33.2-0 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 93b57bda7..59915db57 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 93b57bda7dd43aa04b5954c7c59a6cad51c2a801 +Subproject commit 59915db57701feff137621db5cbfe071252dbaae