From 2e42e30f1c457787218af4a42c9b500bb74f680a Mon Sep 17 00:00:00 2001 From: a1batross Date: Sun, 7 Aug 2016 22:23:23 +0600 Subject: [PATCH 1/4] Update engine. Increase versionCode, so Google Play don't complain about updating Xash3D everytime. --- AndroidManifest.xml | 2 +- jni/src/Xash3D/xash3d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ee42a76a..c59e5e4b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -4,7 +4,7 @@ --> diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index 1b6ab504..e767b91d 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit 1b6ab50478f7c9460bd5a699fc05d3c720a6a40d +Subproject commit e767b91d161fc1f0afb17a5b5f83d157beedc04c From e76774ebe3cb46659a53efd05077bd027332c688 Mon Sep 17 00:00:00 2001 From: a1batross Date: Thu, 11 Aug 2016 12:29:43 +0600 Subject: [PATCH 2/4] Update submodules --- jni/src/NanoGL/nanogl | 2 +- jni/src/Xash3D/xash3d | 2 +- jni/src/hlsdk-xash3d | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl index fba28cff..53620242 160000 --- a/jni/src/NanoGL/nanogl +++ b/jni/src/NanoGL/nanogl @@ -1 +1 @@ -Subproject commit fba28cfff8c488b83b052b92a9f58678c90f2afe +Subproject commit 536202427f3391d23f28e6a81443523da0ac1051 diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index e767b91d..666d7bf1 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit e767b91d161fc1f0afb17a5b5f83d157beedc04c +Subproject commit 666d7bf133f7f53af2f3ce5d3abfb438c9868167 diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d index 29f4c35e..2f317acc 160000 --- a/jni/src/hlsdk-xash3d +++ b/jni/src/hlsdk-xash3d @@ -1 +1 @@ -Subproject commit 29f4c35e6e6433fb990526683b70f809605e7025 +Subproject commit 2f317acc241911dcf07ff8a70a0d374d9d744ecd From 6a3541f6d9a4186cc62c87637bbb84295d55e0cd Mon Sep 17 00:00:00 2001 From: a1batross Date: Thu, 11 Aug 2016 23:34:40 +0600 Subject: [PATCH 3/4] Invert look axes --- src/in/celest/xash3d/XashActivity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java index 8f28682f..39761217 100644 --- a/src/in/celest/xash3d/XashActivity.java +++ b/src/in/celest/xash3d/XashActivity.java @@ -974,12 +974,18 @@ class JoystickHandler_v12 implements JoystickHandler switch( range.getAxis() ) { // typical axes + // move case MotionEvent.AXIS_X: prevSide = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_SIDE, prevSide, dead); break; case MotionEvent.AXIS_Y: prevFwd = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_FWD, prevFwd, dead); break; - case MotionEvent.AXIS_Z: prevPtch = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break; - case MotionEvent.AXIS_RZ: prevYaw = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead); break; + + // rotate. Invert, so by default this works as it's should + case MotionEvent.AXIS_Z: prevPtch = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_PITCH, prevPtch, dead); break; + case MotionEvent.AXIS_RZ: prevYaw = XashActivity.performEngineAxisEvent(-cur, XashActivity.JOY_AXIS_YAW, prevYaw, dead); break; + + // trigger case MotionEvent.AXIS_RTRIGGER: prevLT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_RT, prevLT, dead); break; case MotionEvent.AXIS_LTRIGGER: prevRT = XashActivity.performEngineAxisEvent(cur, XashActivity.JOY_AXIS_LT, prevRT, dead); break; + // hats case MotionEvent.AXIS_HAT_X: prevHX = XashActivity.performEngineHatEvent(cur, true, prevHX); break; case MotionEvent.AXIS_HAT_Y: prevHY = XashActivity.performEngineHatEvent(cur, false, prevHY); break; From e8d0a3a5b6fe04d82b826aa034e3eef7d79232b7 Mon Sep 17 00:00:00 2001 From: a1batross Date: Thu, 11 Aug 2016 23:35:41 +0600 Subject: [PATCH 4/4] Update submodules: engine, json and xash-extras --- jni/src/Xash3D/xash3d | 2 +- src/org/json | 2 +- xash-extras | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d index 666d7bf1..6c417363 160000 --- a/jni/src/Xash3D/xash3d +++ b/jni/src/Xash3D/xash3d @@ -1 +1 @@ -Subproject commit 666d7bf133f7f53af2f3ce5d3abfb438c9868167 +Subproject commit 6c4173633cbb079720f91a0e6a73336af0b9c573 diff --git a/src/org/json b/src/org/json index 9a81b403..4e8e24d4 160000 --- a/src/org/json +++ b/src/org/json @@ -1 +1 @@ -Subproject commit 9a81b40334ff2eba531478d013654c5d1b12ad24 +Subproject commit 4e8e24d49de6e9fa1afeaa992a6b06272858b160 diff --git a/xash-extras b/xash-extras index 3e0b87b9..32e90b47 160000 --- a/xash-extras +++ b/xash-extras @@ -1 +1 @@ -Subproject commit 3e0b87b9e2c66ae8d80686f44d540e36f9753b35 +Subproject commit 32e90b479f22a6281a4b5341ce6dcdc20619ff2d