diff --git a/Projects/Android/.idea/encodings.xml b/Projects/Android/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/Projects/Android/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/Projects/Android/Android.iml b/Projects/Android/Android.iml
index 0fe7ea9..b8c2bb6 100644
--- a/Projects/Android/Android.iml
+++ b/Projects/Android/Android.iml
@@ -1,16 +1,163 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index 1c45517..71e6423 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -2,7 +2,7 @@
+ android:versionName="0.1.1" android:installLocation="auto" >
diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index 0c4ef4b..acc05c7 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -1263,9 +1263,9 @@ static void ovrApp_HandleInput( ovrApp * app )
positional_movementSideways,
positional_movementForward);
- //Jump (B Button)
+ //Jump
handleTrackedControllerButton(&rightTrackedRemoteState_new,
- &rightTrackedRemoteState_old, ovrButton_B, K_SPACE);
+ &rightTrackedRemoteState_old, ovrButton_A, K_SPACE);
if (!r_lefthand->integer) {
if (dominantGripPushed && (GetTimeInMilliSeconds() - dominantGripPushTime) > vr_reloadtimeoutms->integer)
@@ -1290,11 +1290,11 @@ static void ovrApp_HandleInput( ovrApp * app )
}
}
- //Duck with A
- if ((rightTrackedRemoteState_new.Buttons & ovrButton_A) !=
- (rightTrackedRemoteState_old.Buttons & ovrButton_A)) {
+ //Duck with B
+ if ((rightTrackedRemoteState_new.Buttons & ovrButton_B) !=
+ (rightTrackedRemoteState_old.Buttons & ovrButton_B)) {
- sendButtonAction("+duck", (rightTrackedRemoteState_new.Buttons & ovrButton_A));
+ sendButtonAction("+duck", (rightTrackedRemoteState_new.Buttons & ovrButton_B));
}
}
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
index 640699e..c37112a 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
+++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
@@ -52,8 +52,7 @@ void VRRenderer::VidInit()
void VRRenderer::Frame(double time)
{
// make sure these are always properly set
- //GB - Changing to 72 to see if it fixes physics
- gEngfuncs.pfnClientCmd("fps_max 72");
+ gEngfuncs.pfnClientCmd("fps_max 150");
//gEngfuncs.pfnClientCmd("fps_override 1");
gEngfuncs.pfnClientCmd("gl_vsync 0");
gEngfuncs.pfnClientCmd("default_fov 110");
diff --git a/Projects/Android/local.properties b/Projects/Android/local.properties
index 0dea17b..0ec43c0 100644
--- a/Projects/Android/local.properties
+++ b/Projects/Android/local.properties
@@ -4,6 +4,6 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Thu Jul 11 23:47:34 CEST 2019
-ndk.dir=C\:\\Users\\baggyg\\AppData\\Local\\Android\\Sdk\\ndk-bundle
-sdk.dir=C\:\\Users\\baggyg\\AppData\\Local\\Android\\Sdk
+#Sat Oct 13 12:29:31 BST 2018
+ndk.dir=C\:\\Users\\Simon\\AppData\\Local\\Android\\Sdk\\ndk-bundle
+sdk.dir=C\:\\Users\\Simon\\AppData\\Local\\Android\\sdk