diff options
| author | victorfisac <victorfisac@gmail.com> | 2016-05-21 18:06:36 +0200 |
|---|---|---|
| committer | victorfisac <victorfisac@gmail.com> | 2016-05-21 18:06:36 +0200 |
| commit | 0da7c499b6259a717a0d8d9640c60a0064856afb (patch) | |
| tree | e694ac6e808ae9be6ad4c25293a5de45752ec706 | |
| parent | 30c8058fca39e4d6566b2fc06ae2498c48c00717 (diff) | |
| parent | 0b65b44a788d7b53c794ae3d197177ded844bb59 (diff) | |
| download | raylib-0da7c499b6259a717a0d8d9640c60a0064856afb.tar.gz raylib-0da7c499b6259a717a0d8d9640c60a0064856afb.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | examples/core_input_gamepad.c | 3 | ||||
| -rw-r--r-- | src_android/local.properties | 10 | ||||
| -rw-r--r-- | templates/android_project/local.properties | 10 |
4 files changed, 3 insertions, 21 deletions
@@ -6,6 +6,7 @@ src_android/obj/ templates/android_project/bin/ templates/android_project/obj/ templates/android_project/libs/ +local.properties # Ignore thumbnails created by windows Thumbs.db diff --git a/examples/core_input_gamepad.c b/examples/core_input_gamepad.c index 1de2d424..6c356829 100644 --- a/examples/core_input_gamepad.c +++ b/examples/core_input_gamepad.c @@ -36,7 +36,8 @@ int main() //---------------------------------------------------------------------------------- if (IsGamepadAvailable(GAMEPAD_PLAYER1)) { - gamepadMovement = GetGamepadMovement(GAMEPAD_PLAYER1); + gamepadMovement.x = GetGamepadAxisMovement(GAMEPAD_PLAYER1, GAMEPAD_XBOX_AXIS_LEFT_X); + gamepadMovement.y = GetGamepadAxisMovement(GAMEPAD_PLAYER1, GAMEPAD_XBOX_AXIS_LEFT_Y); ballPosition.x += gamepadMovement.x; ballPosition.y -= gamepadMovement.y; diff --git a/src_android/local.properties b/src_android/local.properties deleted file mode 100644 index f46293ea..00000000 --- a/src_android/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -# location of the SDK. This is only used by Ant -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=C:\\android-sdk diff --git a/templates/android_project/local.properties b/templates/android_project/local.properties deleted file mode 100644 index f46293ea..00000000 --- a/templates/android_project/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -# location of the SDK. This is only used by Ant -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=C:\\android-sdk |