Merge of items not picked up in cherry-pick merge

Projects/Android/jni/d3es-multithread-master/neo/framework/Common.h

@@ -218,8 +218,12 @@ public:
 
 	virtual int 				GetFrameNumber() = 0;
 
-								//Haptic Feedback
+	//Haptic Feedback
 	virtual void 				Vibrate(int channel, float low, float high ) = 0;
+	virtual void 				HapticEvent(const char* event, int position, int flags, int intensity, float angle, float yHeight ) = 0;
+	virtual void 				HapticStopEvent(const char* event) = 0;
+	virtual void 				HapticEnable() = 0;
+	virtual void 				HapticDisable() = 0;
 
 	/* Some Mods (like Ruiner and DarkMod when it still was a mod) used "SourceHook"
 	 * to override Doom3 Methods to call their own code before the original method

Projects/Android/jni/d3es-multithread-master/neo/framework/Licensee.h

@@ -41,7 +41,7 @@ If you have questions concerning this license or the applicable additional terms
 #define GAME_NAME						"Doom3Quest"		// appears on window titles and errors
 #endif
 
-#define ENGINE_VERSION					"Doom3Quest 1.1.6"	// printed in console
+#define ENGINE_VERSION					"Doom3Quest 1.2.0"	// printed in console
 
 #ifdef ID_REPRODUCIBLE_BUILD
 	// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__

Projects/Android/jni/d3es-multithread-master/neo/game/Vr.cpp

@@ -27,6 +27,9 @@
 
 idCVar vr_d3qversion( "vr_d3qversion", ENGINE_VERSION, CVAR_ROM | CVAR_GUI, "Version" );
 
+// *** Haptics Service ***
+idCVar vr_useHapticsService( "vr_useHapticsService", "0", CVAR_BOOL | CVAR_ARCHIVE | CVAR_GAME, "Whether full-body haptics are enabled via the external haptics service" );
+
 
 // *** Oculus HMD Variables
 idCVar vr_scale( "vr_scale", "1.0", CVAR_FLOAT | CVAR_ARCHIVE | CVAR_GAME, "World scale. Everything virtual is this times as big." );