From ae21576be10413d0583d0c8f28a5e55d248e0f37 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 12 Jul 2015 01:20:34 +0300 Subject: [PATCH] OpenArena: big update --- .../jni/application/openarena/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openarena/AndroidBuild.sh | 2 +- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/oa-reupload-vm.sh | 2 +- project/jni/application/openarena/vm | 2 +- todo.txt | 10 ---------- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index c2f74335a..80e37c418 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenArena" AppFullName=ws.openarena.sdl # Application version code (integer) -AppVersionCode=08827 +AppVersionCode=08828 # Application user-visible version name (string) -AppVersionName="0.8.8.27" +AppVersionName="0.8.8.28" # 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 @@ -18,13 +18,13 @@ AppVersionName="0.8.8.27" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!Game data|:baseoa/pak0.pk3:pak0.pk3|:baseoa/pak0.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak0.pk3/download^!Game data|:baseoa/pak1-maps.pk3:pak1-maps.pk3|:baseoa/pak1-maps.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak1-maps.pk3/download^!Game data|:baseoa/pak2-players-mature.pk3:pak2-players-mature.pk3|:baseoa/pak2-players-mature.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players-mature.pk3/download^!Game data|:baseoa/pak2-players.pk3:pak2-players.pk3|:baseoa/pak2-players.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak2-players.pk3/download^!Game data|:baseoa/pak4-textures.pk3:pak4-textures.pk3|:baseoa/pak4-textures.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak4-textures.pk3/download^!Game data|:baseoa/pak5-TA.pk3:pak5-TA.pk3|:baseoa/pak5-TA.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak5-TA.pk3/download^!Game data|:baseoa/pak6-misc.pk3:pak6-misc.pk3|:baseoa/pak6-misc.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-misc.pk3/download^!Game data|:baseoa/pak6-patch085.pk3:pak6-patch085.pk3|:baseoa/pak6-patch085.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch085.pk3/download^!Game data|:baseoa/pak6-patch088.pk3:pak6-patch088.pk3|:baseoa/pak6-patch088.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/pak6-patch088.pk3/download^!Game data|:baseoa/skn-arachna-forlorna.pk3:skn-arachna-forlorna.pk3|:baseoa/skn-arachna-forlorna.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/skn-arachna-forlorna.pk3/download^!Game logic|:baseoa/pak7-android.pk3:pak7-android.pk3^!Game data|:baseoa/z_oacmp-volume1-v3.pk3:z_oacmp-volume1-v3.pk3|:baseoa/z_oacmp-volume1-v3.pk3:http://sourceforge.net/projects/libsdl-android/files/OpenArena/0.8.8/z_oacmp-volume1-v3.pk3/download" +AppDataDownloadUrl="!Game data|obb:main.8828|http://sourceforge.net/projects/libsdl-android/files/OpenArena/data-0.8.8.28.zip/download^!Game logic|:baseoa/pak7-android.pk3:pak7-android.pk3" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="libsdl-DownloadFinished-10.flag" +DeleteFilesOnUpgrade="libsdl-DownloadFinished-1.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh index 7e07a6d65..33c056417 100755 --- a/project/jni/application/openarena/AndroidBuild.sh +++ b/project/jni/application/openarena/AndroidBuild.sh @@ -16,7 +16,7 @@ if [ "$1" = "armeabi-v7a" ]; then ( ) || exit 1 fi -env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-$1.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1 +env NO_SHARED_LIBS=1 V=1 ../setEnvironment-$1.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1 # Do not generate shared game logic libs - QVM files are used instead # ../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so" diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index c1c70e58e..903c9d464 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit c1c70e58e04f633a653c751f87f1c7fc1551ee0d +Subproject commit 903c9d4648068c4d42e0c87f3b8063d15eb98328 diff --git a/project/jni/application/openarena/oa-reupload-vm.sh b/project/jni/application/openarena/oa-reupload-vm.sh index 78d85a8ea..24cdf6eec 100755 --- a/project/jni/application/openarena/oa-reupload-vm.sh +++ b/project/jni/application/openarena/oa-reupload-vm.sh @@ -1,3 +1,3 @@ #!/bin/sh -adb shell rm /sdcard/Android/data/ws.openarena.sdl/files/libsdl-DownloadFinished-10.flag +adb shell rm /sdcard/Android/data/ws.openarena.sdl/files/libsdl-DownloadFinished-1.flag [ -n "$1" ] && adb shell rm -r /sdcard/Android/data/ws.openarena.sdl/files/.openarena diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 8039cd095..e540db305 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 8039cd095e7cc11142f431388646b3e7e3462347 +Subproject commit e540db3056a60b59635c6060a685b4ec444639fe diff --git a/todo.txt b/todo.txt index 8634bef21..856bbd91b 100644 --- a/todo.txt +++ b/todo.txt @@ -7,16 +7,6 @@ TODO, which will get actually done - TeeWorlds: control movement with gyroscope. -- OpenArena: navigate game menu with analog joystick. - -- OpenArena: do not treat commands starting with / as chat text. - -- OpenArena: camera points up to the sky after respawn. - -- OpenArena: zooming is broken with floating crosshair. - -- OpenArena: switch weapon button does not work. - - SDL: CompatibilityHacksForceScreenUpdate=y does not redraw screen when invoking from background. - SDL: implement SDL_GL_LoadLibrary() / SDL_GL_GetProcAddress() / SDL_GL_SetAttribute() / SDL_GL_GetAttribute().