From 6ad9bdae315d60c5ca3ff79dc2b847de57b99752 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 28 Nov 2012 19:50:17 +0200 Subject: [PATCH] OpenArena: Added zoom and scoreboard on-screen keys --- project/jni/application/openarena/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openarena/AndroidBuild.sh | 2 ++ project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index fc0f6c09b..cbee5e740 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -29,9 +29,9 @@ AppUsesAccelerometer=y AppUsesMultitouch=y NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE" -AppTouchscreenKeyboardKeysAmount=1 +AppTouchscreenKeyboardKeysAmount=3 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="SLASH UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN" +RedefinedKeysScreenKb="SLASH BACKSPACE TAB RETURN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN" StartupMenuButtonTimeout=3000 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig' FirstStartMenuOptions='' diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh index fadf47a27..b7b448364 100755 --- a/project/jni/application/openarena/AndroidBuild.sh +++ b/project/jni/application/openarena/AndroidBuild.sh @@ -10,6 +10,8 @@ make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1 cd vm/build/release-linux-`uname -m`/baseq3 rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/vm.zip zip -r ../../../../AndroidData/vm.zip vm +cd ../../../android +zip ../../AndroidData/vm.zip * ) env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-armeabi.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 0f7cd57de..dca4a1df1 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 0f7cd57dea6197b4e00c050599ebb0b1264f39a3 +Subproject commit dca4a1df12e0cde7f526b8dd8e1789157398dc79 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index a6b2d7215..c5877216b 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit a6b2d72158e26c6c868fac0eec209fb605004cb8 +Subproject commit c5877216b00201e6489de117e77e7feaad08ce9b