diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index a41e6e251..952950773 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit a41e6e2511cd5d76bc7aa2c9aa6ea45e98f0b78c +Subproject commit 95295077355cce146b3af5998bb0b76186a7e7d0 diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg index 2c45b6914..e6b6b0c09 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=01911 +AppVersionCode=02012 # Application user-visible version name (string) -AppVersionName="0.1.9.11 pre-alpha early access" +AppVersionName="0.2.0.12" # 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 fa1f96954..d392c5f3f 100755 --- a/project/jni/application/ninslash/AndroidPreBuild.sh +++ b/project/jni/application/ninslash/AndroidPreBuild.sh @@ -20,11 +20,12 @@ 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 } -[ -n "`find data *.txt *.cfg 'example configs' -cnewer ../AndroidData/data.zip 2>&1`" ] && { + echo "Archiving data" mkdir -p ../AndroidData +rm -f ../AndroidData/data.zip zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" >/dev/null -} + for ARCH in armeabi-v7a x86; do [ -e ../AndroidData/binaries-$ARCH.zip ] && \ diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index 78c0b8623..a877391fc 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit 78c0b862397e0f3a0ec0411d447a489745338feb +Subproject commit a877391fc0df8421cdeeea45204632a179b11ce5