diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg index bb3eaa6eb..6e5252248 100644 --- a/project/jni/application/ninslash/AndroidAppSettings.cfg +++ b/project/jni/application/ninslash/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Ninslash" AppFullName=ninslash.com # Application version code (integer) -AppVersionCode=03030 +AppVersionCode=03231 # Application user-visible version name (string) -AppVersionName="0.3.0.30" +AppVersionName="0.3.2.31" # 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, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh index 9ab704d81..506d931f2 100755 --- a/project/jni/application/ninslash/AndroidPreBuild.sh +++ b/project/jni/application/ninslash/AndroidPreBuild.sh @@ -20,13 +20,11 @@ python datasrc/compile.py server_content_header > src/game/generated/server_data python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp } - echo "Archiving data" mkdir -p ../AndroidData ln -sf ../src/logo.png ../AndroidData rm -f ../AndroidData/data.zip -zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" >/dev/null - +zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" cfg >/dev/null for ARCH in armeabi-v7a x86 arm64-v8a; do [ -e ../AndroidData/binaries-$ARCH.zip ] && \ diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index db7c9d5b7..f29c6be28 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit db7c9d5b73e5c1117c0226945c523792fa729218 +Subproject commit f29c6be28c2407b1c097ec164aa57688a3ba6f74 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 8ce569441..ca629a74c 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 8ce5694417199eb41ef1fbc6883544dbe448d61b +Subproject commit ca629a74c84fc300255e57e507c0d375ac50668f