miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated .gitmodules

Browse Source
This commit is contained in:
pelya
2013-12-08 16:14:13 +02:00
parent b4af623fda
commit ad07bc9a94
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -37,3 +37,6 @@
[submodule "project/jni/application/xserver/xserver"] [submodule "project/jni/application/xserver/xserver"]
path = project/jni/application/xserver/xserver path = project/jni/application/xserver/xserver
url = git@github.com:pelya/xserver.git url = git@github.com:pelya/xserver.git
[submodule "android-shmem"]
path = project/jni/shmem
url = git@github.com:pelya/android-shmem.git

14
project/jni/application/teeworlds/AndroidAppSettings.cfg
View File

@@ -103,7 +103,7 @@ AppUsesSecondJoystick=y
AppUsesAccelerometer=n AppUsesAccelerometer=n
# Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4 # Application uses gyroscope (y) or (n), the gyroscope will be used as joystick 1 axes 2-4
AppUsesGyroscope=y AppUsesGyroscope=n
# Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0 # Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBALLMOTION events for the joystick 0
AppUsesMultitouch=n AppUsesMultitouch=n
@@ -133,10 +133,10 @@ AppTouchscreenKeyboardKeysAmount=4
AppTouchscreenKeyboardKeysAmountAutoFire=0 AppTouchscreenKeyboardKeysAmountAutoFire=0
# Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right)
RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RETURN RCTRL" RedefinedKeysScreenKb="RETURN PAGEDOWN PAGEUP TAB SPACE RCTRL"
# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu
RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire" RedefinedKeysScreenKbNames="Hook Next_weapon Previous_weapon Show_scores Jump Fire"
# On-screen keys theme # On-screen keys theme
# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)
@@ -164,16 +164,16 @@ FirstStartMenuOptions=''
# Enable multi-ABI binary, with hardware FPU support - it will also work on old devices, # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
# but .apk size is 2x bigger (y) / (n) / (x86) / (all) # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
MultiABI=y MultiABI=all
# Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
AppMinimumRAM=0 AppMinimumRAM=0
# Application version code (integer) # Application version code (integer)
AppVersionCode=06215 AppVersionCode=06217
# Application user-visible version name (string) # Application user-visible version name (string)
AppVersionName="0.6.2.15" AppVersionName="0.6.2.17"
# Reset SDL config when updating application to the new version (y) / (n) # Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y ResetSdlConfigForThisVersion=y
@@ -209,7 +209,7 @@ AppCmdline=''
# Here you may type readme text, which will be shown during startup. Format is: # Here you may type readme text, which will be shown during startup. Format is:
# Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?) # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?)
ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump\\\\nTilt your phone/tablet to jump^ouya:' ReadmeText='Tap left joystick while aiming to launch hook\\\\nSwipe left joystick up or down to jump^ouya:'
# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge

2
project/jni/boost/src

Submodule project/jni/boost/src updated: 5824acb451...860155f1fb