diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 13252e15d..1bcbadd1e 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 13252e15db578ccfcde859212cff9fab7c1aa5eb +Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845 diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 07c011b6c..30e98be35 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 07c011b6ccb275fc2b69dbd6e7ee8dba6223e59a +Subproject commit 30e98be3582cca3009f371ca2f9a7334e24e1582 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 4b83db91a..278f04520 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 4b83db91ab39b9cae27f087fe1a0a8ba9f30d43d +Subproject commit 278f045202ff1bc0c1911b6c3d441909ba93ee87 diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index 34b64249c..e5489c8c0 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit 34b64249c46a90ce127f32b3ef41a565b8a70a61 +Subproject commit e5489c8c089e57d88bbaa90df0176d5e5d4c6351 diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index c6f7b94d1..0cf15fb4b 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -128,7 +128,7 @@ NonBlockingSwapBuffers=n # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA -RedefinedKeys="LALT RETURN NO_REMAP NO_REMAP RETURN UNDO" +RedefinedKeys="LALT UNDO NO_REMAP NO_REMAP UNDO HELP" # Number of virtual keyboard keys (currently 6 is maximum) AppTouchscreenKeyboardKeysAmount=0 @@ -174,13 +174,13 @@ MultiABI=armeabi-v7a AppMinimumRAM=0 # Application version code (integer) -AppVersionCode=28201 +AppVersionCode=28203 # Application user-visible version name (string) -AppVersionName="2.8.2.01" +AppVersionName="2.8.2.03" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="%" diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg index c71808c10..378f0e36e 100644 --- a/project/jni/application/xserver/AndroidAppSettings.cfg +++ b/project/jni/application/xserver/AndroidAppSettings.cfg @@ -128,7 +128,7 @@ NonBlockingSwapBuffers=n # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA -RedefinedKeys="LALT RETURN NO_REMAP NO_REMAP RETURN UNDO" +RedefinedKeys="LALT UNDO NO_REMAP NO_REMAP UNDO HELP" # Number of virtual keyboard keys (currently 6 is maximum) AppTouchscreenKeyboardKeysAmount=0 @@ -174,13 +174,13 @@ MultiABI=armeabi-v7a AppMinimumRAM=0 # Application version code (integer) -AppVersionCode=11104 +AppVersionCode=11105 # Application user-visible version name (string) -AppVersionName="1.11.04" +AppVersionName="1.11.05" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="%" diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 34c905d98..5018d4c6c 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 34c905d98666a1f023e27e969c7b18984f8b619e +Subproject commit 5018d4c6ccd7962e640941400802e8b9b6be4562 diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c index a41bec6c8..428654cb7 100644 --- a/project/jni/sdl-1.2/src/video/android/keymap.c +++ b/project/jni/sdl-1.2/src/video/android/keymap.c @@ -250,18 +250,18 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 0, 0, 0, - 22, - 23, + 22, // SDLK_BACKSPACE = 8 + 23, // SDLK_TAB = 9 0, 0, 0, - 36, + 36, // SDLK_RETURN 0, 0, 0, 0, 0, - 127, + 127, // SDLK_PAUSE 0, 0, 0, @@ -269,29 +269,29 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 0, 0, 0, - 9, + 9, // SDLK_ESCAPE = 27 0, 0, 0, 0, - 65, + 65, // SDLK_SPACE = 32 0, 0, 0, 0, 0, 0, - 48, + 48, // SDLK_QUOTE = 39 0, 0, 0, 0, - 59, - 20, - 60, - 61, - 19, - 10, + 59, // SDLK_COMMA = 44 + 20, // SDLK_MINUS + 60, // SDLK_PERIOD + 61, // SDLK_SLASH + 19, // SDLK_0 = 48 + 10, // SDLK_1 = 49 11, 12, 13, @@ -299,11 +299,20 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 15, 16, 17, - 18, + 18, // SDLK_9 = 57 0, - 47, + 47, // SDLK_SEMICOLON = 59 0, - 21, + 21, // SDLK_EQUALS = 61 + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, // 70 0, 0, 0, @@ -313,6 +322,7 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 0, 0, 0, + 0, // 80 0, 0, 0, @@ -322,24 +332,14 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 0, 0, 0, + 0, // 90 + 34, // SDLK_LEFTBRACKET = 91 + 51, // SDLK_BACKSLASH = 92 + 35, // SDLK_RIGHTBRACKET = 93 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 34, - 51, - 35, - 0, - 0, - 49, - 38, + 49, // SDLK_BACKQUOTE = 96 + 38, // SDLK_a = 97 56, 54, 40, @@ -364,12 +364,12 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 25, 53, 29, - 52, + 52, // SDLK_z = 122 0, 0, 0, 0, - 119, + 119, // SDLK_DELETE = 127 0, 0, 0, @@ -513,18 +513,18 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 63, 82, 86, - 104, - 0, - 111, - 116, - 114, - 113, - 118, - 110, - 115, - 112, - 117, - 67, + 104, // SDLK_KP_ENTER = 271 + 0, // SDLK_KP_EQUALS = 272 + 111, // SDLK_UP = 273 + 116, // SDLK_DOWN = 274 + 114, // SDLK_RIGHT = 275 + 113, // SDLK_LEFT = 276 + 118, // SDLK_INSERT = 277 + 110, // SDLK_HOME = 278 + 115, // SDLK_END = 279 + 112, // SDLK_PAGEUP = 280 + 117, // SDLK_PAGEDOWN = 281 + 67, // SDLK_F1 = 282 68, 69, 70, @@ -535,33 +535,33 @@ unsigned char SDL_android_keysym_to_scancode[SDLK_LAST] = { 75, 76, 95, - 96, + 96, // SDLK_F12 = 293 0, 0, 0, 0, 0, 0, - 77, - 66, - 78, - 62, - 50, - 105, - 37, - 108, - 64, + 77, // SDLK_NUMLOCK = 300 + 66, // SDLK_CAPSLOCK = 301 + 78, // SDLK_SCROLLOCK = 302 + 62, // SDLK_RSHIFT = 303 + 50, // SDLK_LSHIFT = 304 + 105, // SDLK_RCTRL = 305 + 37, // SDLK_LCTRL = 306 + 108, // SDLK_RALT = 307 + 64, // SDLK_LALT = 308 0, 0, - 133, - 134, + 133, // SDLK_LSUPER = 311 /**< Left "Windows" key */ + 134, // SDLK_RSUPER = 312 /**< Right "Windows" key */ 0, 0, 0, - 107, + 107, // SDLK_PRINT = 316 0, 0, - 135, + 135, // SDLK_MENU = 319 0, 0, 0,