Merge branch 'master' of https://github.com/DrBeef/RTCWQuest

Projects/Android/jni/rtcw/src/cgame/cg_view.c

@@ -1661,6 +1661,12 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
 		CG_Printf( "cg.clientFrame:%i\n", cg.clientFrame );
 	}
 
+	//Don't allow long running haptics to continue once dead
+	if ( cg.predictedPlayerState.stats[STAT_HEALTH] <= 0 ) {
+		trap_Vibrate(0, 0, 0.0);
+		trap_Vibrate(0, 1, 0.0);
+	}
+
 	DEBUGTIME
 }
 

Projects/Android/jni/rtcw/src/cgame/cg_weapons.c

@@ -2227,7 +2227,6 @@ static void CG_FlamethrowerFlame( centity_t *cent, vec3_t origin ) {
 
         CG_FireFlameChunks(cent, origin, angles, 1.0, qtrue, 1);
 
-        trap_Vibrate(-1, cgVR->right_handed ? 1 : 0, 0.6);
         trap_Vibrate(-1, cgVR->right_handed ? 1 : 0, 0.6);
         if (cgVR->weapon_stabilised)
         {
@@ -3560,9 +3559,11 @@ void CG_AddViewWeapon( playerState_t *ps ) {
         vec3_t forward, right, up;
         AngleVectors(angles, forward, right, up);
 
-        VectorMA(origin, 40, forward, endForward);
+		trace_t trace;
+		VectorMA(origin, 8192, forward, endForward);
+		trap_CM_BoxTrace(&trace, origin, endForward, NULL, NULL, 0, MASK_SOLID);
         VectorSet(ci.color, 1, 0, 0); // Forward is red
-        CG_RailTrail2(&ci, origin, endForward);
+        CG_RailTrail2(&ci, origin, trace.endpos);
 
         VectorMA(origin, 20, right, endRight);
         VectorSet(ci.color, 0, 1, 0); // right is green

Projects/Android/jni/rtcw/src/game/g_weapon.c

@@ -696,7 +696,7 @@ float G_GetWeaponSpread( int weapon ) {
 			// these should be higher since they become erratic if aiming is out
 			switch ( weapon ) {
 			case WP_LUGER:      return 200;
-			case WP_SILENCER:   return 100;//900; // make silencer very accurate
+			case WP_SILENCER:   return 200;//900; // make silencer as accurate as luger
 			case WP_COLT:       return 600;
 			case WP_AKIMBO:     return 700; //----(SA)	added
 			case WP_VENOM:      return 1000;
@@ -1964,13 +1964,10 @@ void FireWeapon( gentity_t *ent ) {
 		aimSpreadScale = 1.0;
 	}
 
-	//Let VR user be the bad shot
-	aimSpreadScale /= 1.2;
-
 	if (gVR->weapon_stabilised)
 	{
 		//Stabilised weapon is even more accurate
-		aimSpreadScale /= 2.0;
+		aimSpreadScale /= 2.5f;
 	}
 
 

README.md

@@ -1,2 +1,171 @@
-# RTCWQuest
+![RTCW Banner](https://github.com/DrBeef/RTCWQuest/blob/master/assets/RTCW.PNG)
-Return to Castle Wolenstein for the Oculus Quest
+====
+
+RTCWQuest
+==========
+
+Welcome to the one and only fully wireless 6DoF implementation of the _Return to Castle Wolfenstein_ single player campaign in VR.
+
+This is built solely for the Oculus Quest VR HMD and will *not* run on any other device.
+
+The easiest way to install this on your Quest is using SideQuest, a Desktop app designed to simplify sideloading apps and games ( even beat saber songs on quest ) on Standalone Android Headsets like Oculus Quest and Oculus Go. It supports drag and drop for installing APK files!
+
+Download SideQuest here:
+https://github.com/the-expanse/SideQuest/releases
+
+
+
+IMPORTANT NOTE
+--------------
+
+This is just an engine port; though the apk does contain the DEMO version of RTCW, not the full game. If you wish to play the full game you must purchase it yourself, steam is most straightforward:  [STEAM LINK]
+
+
+Copying the Full Game PAK files to your Oculus Quest
+----------------------------------------------------
+
+Copy the PAK files from the installed RTCW game folder on your PC to the /RTCWQuest/Main folder on your Oculus Quest when it is connected to the PC. You have to have run RTCWQuest at least once for the folder to be created and if you don't see it when you connect your Quest to the PC you might have to restart the Quest.
+
+
+Caveats
+-------
+
+WARNING:  There is a good chance that unless you have your VR-legs this will probably make you feel a bit sick. The moment you start to feel under the weather YOU MUST STOP PLAYING for a good period of time before you try again. I will not be held responsible for anyone making themselves ill.
+
+Configuration
+-------------
+
+There are plenty of options available in the controls configuration menu. Be sure to check them out.
+
+*Smooth Turning*
+
+To enable smooth turning, simply set the snap turn value to very low, try a few values out to find one that suits you.
+
+*Teleport*
+
+Once teleport has been enabled in the config menu, you can press the off-hand trigger to activate the teleport, aim with the offhand controller to the desired location and release the trigger to teleport, normal locomotion is still available too, though if you wish to turn that off then you can reduce the movement speed to zero in the configuration menu.
+**NOTE: There is nothing to stop you cheating with the teleport**
+
+*Laser Sight*
+
+If you really want to, you can enable a laser sight in the controls menu.
+
+*Height Adjust*
+
+Player height can be adjusted for those that wish to play seated.
+
+
+Controls
+========
+
+Note: the controls should be reversed for left handed players
+
+* Open the in-game menu with the left-controller menu button (same irrespective of right/left handed control)
+* A Button - Crouch
+* B Button - Jump
+* Y Button - Bring up the notebook
+* X Button - Show / Hide the HUD
+* Right-Hand Controller - Weapon orientation
+* Right-Hand Thumbstick - left/right Snap or Smooth turn, up/down weapon change
+* Right-Hand Thumbstick click - "activate" button (open doors, pull levers, pickup chairs etc)
+* Right-Hand Trigger - Fire
+* Right Grip Button - short click = reload, long press and trigger to switch weapon to alt-fire (more on this shortly)
+* Left-Hand Controller - Direction of movement (or HMD direction if configured)
+* Left-Hand Thumbstick - locomotion
+* Left-Hand Trigger - Run / Teleport
+* Left-Hand Grip Button - Two handed Weapon Stabilisation - will increase accuracy of weapons
+* Left-Hand Thumbstick click - Kick
+
+
+Alt-Fire
+--------
+
+Press and hold the grip button then pull the trigger to select the alternative weapon mode.
+
+
+Weapon Specific Controls
+========================
+
+Sniper Scopes
+-------------
+
+The FG42 and the Mauser can have their scopes toggled on and off by using the weapon alt mode (note the scoped Mauser is only available once the scope has been picked up in the game). When the scope is attached, to trigger the scoped view, ensure you are holding the weapon in two hands (use off-hand grip button) and then look through the scope on the weapon, this will switch you to scope mode:
+
+* Move the controllers like you would when looking through the scope to aim by moving the weapon
+* Use the dominant thumb stick forward / back to zoom in / out
+* When using the scope you will move at 1/3 normal speed
+* Thumbstick Turning is disabled when the scope is active
+* Release the off hand grip or move the dominant controller away from your face to exit scoped mode
+
+
+Knife
+-----
+
+There is no fire button, simply stab with it or swing it to use it like a knife.
+
+
+Grenades / Pineapples / Dynamite
+--------------------------------
+
+These are all throwable. Hold the trigger and then throw the item, releasing the trigger at the apex of the throw.
+
+
+Mounted Guns (MG42)
+-------------------
+
+Mounted guns are aimed using gaze direction, pull trigger to fire, press "activate" to enter/exit mounted gun mode.
+
+
+
+Backpack
+--------
+
+There is a handy backpack feature which acts as a quick access to certain weapons/pickups. To access the backpack move the controller out of sight over your shoulder. 
+Press and hold one of the following buttons to access the associated items:
+
+*Dominant Hand Controller*
+
+* A (or X for left handed) - Knife (useful to quickly smash up stuff or stab)
+* B (or Y for left handed) - Binoculars (once you have picked them up in game), raise them to your face to look through them, pull trigger to zoom in/out
+* Grip button - Grenades / Dynamite - You can then throw them in the usual manner using the trigger
+
+Release the button to return to the previously active weapon
+
+*Off Hand Controller*
+
+* X (or A for left handed) - Quick Save Game
+* Y (or B for left handed) - Load Last Quick Save
+
+
+Things to note / FAQs:
+----------------------
+
+* Mods and Texture packs that work:...
+
+
+Credits:
+--------
+
+I would like to thank the following teams and individual for making this possible:
+
+
+* Emile Belanger - For once again providing the android port upon which this is based. See his other Android ports [here](http://www.beloko.com/)
+* Baggyg - My long-time VR friend whose roles in this have been varied and all helpful, also the creator of excellent websites/artwork/assets for this mod as well as various  model alterations to be more VR friendly (removing hands, tweaking iron sights, alignment etc)
+* VR_Bummser - PR person extraordinaire, play tester and all round helpful and good guy. Hoping I can buy him a beer in person one day!
+* The [SideQuest](https://sidequestvr.com/#/news) team - For making it easy for people to install this
+* **Weapon Pack Credits**
+* [ptitSeb](https://github.com/ptitSeb/gl4es) for GLE4ES for the OpenGL -> OpenGLES2 translation: without which this project wouldn't have worked at all
+
+
+Building:
+---------
+
+You need the following:
+
+* Android Developer Studio
+* Latest Android Native Development Kit
+* Oculus Mobile SDK 1.30.0
+* The RTCWQuest folder cloned from GitHub should be below VrSamples in the extracted SDK
+* Create a local.properties file in the root of the extracted Oculus Mobile SDK that contains the ndk.dir and sdk.dir properties for where your SDK/NDK are located (see Gradle documentation regarding this)
+* To build debug you will need a _android.debug.keystore_ file placed in the following folder:
+_oculus_sdk_dir_/VrSamples/RTCWQuest/Projects/Android

assets/weapons_vr.cfg

@@ -33,22 +33,23 @@
 // put the weapon id at the end of the cvar name, so the knife is vr_weapon_adjustment_1
 // Values are:  scale,right,up,forward,pitch,yaw,roll
 
-seta vr_weapon_adjustment_20 "0.50,-11.0,12.40,-22.42,0.80,-1.40,0.00"
+seta vr_weapon_adjustment_20 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
-seta vr_weapon_adjustment_19 "0.50,-9.12,13.72,-20.60,-2.80,-4.60,0.00"
+seta vr_weapon_adjustment_19 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
-seta vr_weapon_adjustment_14 "0.54,-10.78,14.78,-19.89,0.00,7.20,-8.00"
+seta vr_weapon_adjustment_14 "0.55,-12.11,15.20,-21.05,0.20,1.40,0.00"
-seta vr_weapon_adjustment_8 "0.54,-9.08,11.38,-6.61,0.00,0.00,0.00"
+seta vr_weapon_adjustment_8 "0.75,-9.28,12.23,-6.09,0.00,0.00,0.00"
-seta vr_weapon_adjustment_5 "0.55,-8.70,8.91,-16.49,0.00,1.40,0.00"
+seta vr_weapon_adjustment_5 "0.65,-8.61,8.82,-16.44,0.20,1.40,0.00"
-seta vr_weapon_adjustment_4 "0.50,-8.65,11.80,-1.39,-1.20,-1.80,0.00"
+seta vr_weapon_adjustment_4 "0.53,-9.17,13.42,6.73,0.20,-1.50,5.50"
-seta vr_weapon_adjustment_22 "0.49,-11.93,14.43,-21.31,0.00,0.00,0.00"
+seta vr_weapon_adjustment_22 "0.65,-10.52,13.71,-20.46,0.20,1.40,0.00"
-seta vr_weapon_adjustment_13 "0.55,-9.38,10.32,-1.27,0.00,-1.80,0.00"
+seta vr_weapon_adjustment_13 "0.55,-9.34,10.40,-2.15,0.20,-1.50,5.50"
-seta vr_weapon_adjustment_10 "0.54,-8.41,4.83,0.00,0.00,0.00,0.00"
+seta vr_weapon_adjustment_10 "0.70,-8.28,8.19,-12.26,0.00,0.40,0.00"
-seta vr_weapon_adjustment_9 "0.54,-9.52,4.83,4.39,0.00,0.00,0.00"
+seta vr_weapon_adjustment_9 "0.75,-9.52,7.61,-11.47,0.00,0.00,0.00"
-seta vr_weapon_adjustment_7 "0.91,-5.53,9.43,1.19,0.00,0.00,0.00"
+seta vr_weapon_adjustment_7 "1.17,-5.62,7.62,-6.15,0.00,0.00,0.00"
-seta vr_weapon_adjustment_18 "0.50,-8.53,12.52,0.00,-5.20,0.00,0.00"
+seta vr_weapon_adjustment_18 "0.55,-7.88,12.70,-3.87,-4.80,1.50,-3.70"
-seta vr_weapon_adjustment_12 "0.64,-7.66,10.35,-8.82,-3.20,0.00,0.00"
+seta vr_weapon_adjustment_12 "0.75,-7.59,9.30,-12.25,-3.40,0.00,0.00"
-seta vr_weapon_adjustment_11 "0.50,-9.60,13.40,-22.42,0.80,-1.40,0.00"
+seta vr_weapon_adjustment_11 "0.55,-9.49,12.98,-22.76,1.60,-0.50,0.00"
-seta vr_weapon_adjustment_6 "0.54,-10.78,14.78,-19.89,0.00,7.20,-8.00"
+seta vr_weapon_adjustment_6 "0.65,-10.62,12.90,-20.74,0.20,1.40,0.00"
-seta vr_weapon_adjustment_3 "0.60,-8.23,8.95,-9.46,-2.00,0.00,0.00"
+seta vr_weapon_adjustment_3 "0.60,-8.76,11.68,-7.21,-3.40,0.00,3.60"
-seta vr_weapon_adjustment_2 "0.50,-8.99,13.81,-21.90,-5.20,-4.20,0.00"
+seta vr_weapon_adjustment_2 "0.55,-9.13,12.84,-20.25,-5.30,-4.60,0.00"
-seta vr_weapon_adjustment_1 "0.60,-5.23,9.24,-10.73,22.60,13.50,29.30"
+seta vr_weapon_adjustment_1 "0.60,-5.03,7.45,-13.41,0.00,0.00,0.00"
+