From bcd427c9efab4706303bdfe22e7ec9a5e1b94d32 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 22 Sep 2013 13:26:27 +0300 Subject: [PATCH] OpenArena: revert to Slash key as weapnext instead of Enter, because of Ouya --- project/jni/application/openarena/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openarena/vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 11631e379..58796f952 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -133,14 +133,14 @@ AppTouchscreenKeyboardKeysAmount=6 AppTouchscreenKeyboardKeysAmountAutoFire=0 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="RETURN BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN" +RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu RedefinedKeysScreenKbNames="Change_weapon Sniper_view Show_scores Quick_rotate Fire Jump" # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb -RedefinedKeysGamepad="RETURN BACKSPACE TAB END SPACE LCTRL SPACE LCTRL V E" +RedefinedKeysGamepad="SLASH BACKSPACE TAB END SPACE LCTRL SPACE LCTRL V E" # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 1aa8636cd..4b83db91a 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 1aa8636cdb32937d8081efc9d43f00060e6d1704 +Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d