From c0983f34007877bdf730471715163aff32ce89f1 Mon Sep 17 00:00:00 2001 From: Gordon McShane Date: Fri, 20 May 2016 11:03:44 -0700 Subject: [PATCH 1/2] fix example - fix gamepad axis query in example broken by db4585b Improved gamepad support --- examples/core_input_gamepad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From c9ac176fa794a4601e9f5ec789b9f6ab5d11e9af Mon Sep 17 00:00:00 2001 From: Gordon McShane Date: Fri, 20 May 2016 11:26:06 -0700 Subject: [PATCH 2/2] remove user-specific ant files --- .gitignore | 1 + src_android/local.properties | 10 ---------- templates/android_project/local.properties | 10 ---------- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src_android/local.properties delete mode 100644 templates/android_project/local.properties diff --git a/.gitignore b/.gitignore index 34affc87..d6a55b26 100644 --- a/.gitignore +++ b/.gitignore @@ -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/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