From 9b1f14a3fac82ace204518d5fba61e0aaca96fed Mon Sep 17 00:00:00 2001 From: pelya Date: Sat, 1 Dec 2012 02:59:38 +0200 Subject: [PATCH] Updated OpenArena project --- project/jni/application/ballfield/AndroidAppSettings.cfg | 2 +- project/jni/application/openarena/AndroidAppSettings.cfg | 2 +- project/jni/application/openarena/AndroidBuild.sh | 1 + project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 6961c56e0..f52fc12be 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -29,7 +29,7 @@ AppUsesAccelerometer=y AppUsesMultitouch=y NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE" -AppTouchscreenKeyboardKeysAmount=0 +AppTouchscreenKeyboardKeysAmount=6 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9" StartupMenuButtonTimeout=3000 diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 1ad6e6152..ef9ad1041 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -31,7 +31,7 @@ NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE" AppTouchscreenKeyboardKeysAmount=3 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="SLASH BACKSPACE TAB LEFT RIGHT RETURN UNKNOWN UNKNOWN UNKNOWN UNKNOWN" +RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LEFT RIGHT 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 18255f993..988b554a0 100755 --- a/project/jni/application/openarena/AndroidBuild.sh +++ b/project/jni/application/openarena/AndroidBuild.sh @@ -12,6 +12,7 @@ rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/vm.zip zip -r ../../../../AndroidData/vm.zip vm cd ../../../android zip ../../AndroidData/vm.zip * +ln -sf ../engine/misc/quake3-tango.png ../../AndroidData/logo.png ) 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 542cfb7a6..f0a9c28db 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 542cfb7a68d7f3bc356af3028869b0f0407ea5ef +Subproject commit f0a9c28dbea1f77267446ab4cd2552cb409a1c26 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 4a39bfea3..0103dac47 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 4a39bfea3fa1250fb19a674bcbec4d0cfbfb8d50 +Subproject commit 0103dac4759bb97751fcd24b911cd397cc551905