Merge branch 'main' into contributions

.gitignore

@@ -260,3 +260,21 @@ pip-log.txt
 ## CLion
 #############
 .idea
+JKXR-PCVR-Installer/JKXR_JKO.exe
+JKXR-PCVR-Installer/JKXR_JKA.exe
+JKXR-PCVR-Installer/JKXR_JKA_Setup.exe
+JKXR-PCVR-Installer/JKXR_JKO_Setup.exe
+JKXR-PCVR-Installer/JKO/rdjosp-vanilla_x86_64.dll
+JKXR-PCVR-Installer/JKO/openjo_sp.x86_64.exe
+JKXR-PCVR-Installer/JKO/jospgamex86_64.dll
+JKXR-PCVR-Installer/JKO/base/Haps_Stormtrooper.pk3
+JKXR-PCVR-Installer/JKO/base/GGDynamicWeapons.pk3
+JKXR-PCVR-Installer/JKO/base/Episode3blades.pk3
+JKXR-PCVR-Installer/JKO/base/assets6_vr_weapons_shaders.pk3
+JKXR-PCVR-Installer/JKA/rdsp-vanilla_x86_64.dll
+JKXR-PCVR-Installer/JKA/openjk_sp.x86_64.exe
+JKXR-PCVR-Installer/JKA/jagamex86_64.dll
+JKXR-PCVR-Installer/JKA/base/GGDynamicWeapons.pk3
+JKXR-PCVR-Installer/JKA/base/Episode3blades.pk3
+JKXR-PCVR-Installer/JKA/base/DT_Stormtrooper_ROTJ_SP.pk3
+JKXR-PCVR-Installer/JKA/base/DT_Stormtrooper_ROTJ.pk3

JKXR-PCVR-Installer/JKXR_JKA.iss

@@ -0,0 +1,90 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "JKXR - Jedi Academy"
+#define MyAppVersion "1.0.21"
+#define MyAppPublisher "Team Beef VR"
+#define MyAppURL "https://www.patreon.com/teambeef"
+#define MyAppExeName "openjk_sp.x86_64.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{330568D5-5C62-44D3-8C54-5D51FFEEDFFC}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\Steam\steamapps\common\Jedi Academy\GameData\
+DisableProgramGroupPage=yes
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+OutputDir=C:\Dev\Quest\JKXR\JKXR-PCVR-Installer
+OutputBaseFilename=JKXR_JKA_Setup
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+AlwaysShowDirOnReadyPage=yes
+AppendDefaultDirName=no   
+DisableWelcomePage=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\jagamex86_64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\OpenAL32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\rdsp-vanilla_x86_64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\packaged_mods_credits.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\base\*"; DestDir: "{app}\base"; Flags: ignoreversion recursesubdirs createallsubdirs     
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\vr_splash.bmp"; Flags: dontcopy
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Code]
+var
+  Page: TWizardPage;
+
+procedure InitializeWizard();
+var
+  BitmapImage: TBitmapImage;
+  BitmapFileName: String;
+
+begin
+  Page := CreateCustomPage(wpWelcome, 'JKXR - Jedi Academy Installer', 'Join our Patreon at:   patreon.com/teambeef');
+  BitmapFileName := ExpandConstant('{tmp}\vr_splash.bmp');
+  ExtractTemporaryFile(ExtractFileName(BitmapFileName));
+  BitmapImage := TBitmapImage.Create(Page);    
+  BitmapImage.Bitmap.LoadFromFile(BitmapFileName); 
+  BitmapImage.Center := True;
+  BitmapImage.Stretch := True;
+  BitmapImage.Parent := Page.Surface;
+  with BitmapImage do begin
+    Width := Page.SurfaceHeight + 10;
+    Height := Page.SurfaceHeight + 10;
+    Parent := Page.Surface;
+  end;
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  { Validate certain pages before allowing the user to proceed }
+  if CurPageID = Page.ID then begin
+    SuppressibleMsgBox('If installing into the same location as an existing Jedi Academy install, please ensure you choose the directory that contains the single player executable and the "base" folder (probably called Jedi Academy\GameData)', mbConfirmation, MB_OK, IDOK);
+  end;
+  Result := True;
+end;

JKXR-PCVR-Installer/JKXR_JKO.iss

@@ -0,0 +1,90 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "JKXR - Jedi Outcast"
+#define MyAppVersion "1.0.21"
+#define MyAppPublisher "Team Beef VR"
+#define MyAppURL "https://www.patreon.com/teambeef"
+#define MyAppExeName "openjo_sp.x86_64.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{3B2C9382-66B4-48E6-B625-F567F350283D}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\Steam\steamapps\common\Jedi Outcast\GameData\
+DisableProgramGroupPage=yes
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+OutputDir=C:\Dev\Quest\JKXR\JKXR-PCVR-Installer
+OutputBaseFilename=JKXR_JKO_Setup
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+AlwaysShowDirOnReadyPage=yes
+AppendDefaultDirName=no
+DisableWelcomePage=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\jospgamex86_64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\OpenAL32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\rdjosp-vanilla_x86_64.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\packaged_mods_credits.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\base\*"; DestDir: "{app}\base"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\vr_splash.bmp"; Flags: dontcopy
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Code]
+var
+  Page: TWizardPage;
+
+procedure InitializeWizard();
+var
+  BitmapImage: TBitmapImage;
+  BitmapFileName: String;
+
+begin
+  Page := CreateCustomPage(wpWelcome, 'JKXR - Jedi Outcast Installer', 'Join our Patreon at:   patreon.com/teambeef');
+  BitmapFileName := ExpandConstant('{tmp}\vr_splash.bmp');
+  ExtractTemporaryFile(ExtractFileName(BitmapFileName));
+  BitmapImage := TBitmapImage.Create(Page);    
+  BitmapImage.Bitmap.LoadFromFile(BitmapFileName); 
+  BitmapImage.Center := True;
+  BitmapImage.Stretch := True;
+  BitmapImage.Parent := Page.Surface;
+  with BitmapImage do begin
+    Width := Page.SurfaceHeight + 10;
+    Height := Page.SurfaceHeight + 10;
+    Parent := Page.Surface;
+  end;
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  { Validate certain pages before allowing the user to proceed }
+  if CurPageID = Page.ID then begin
+    SuppressibleMsgBox('If installing into the same location as an existing Jedi Outcast install, please ensure you choose the directory that contains the single player executable and the "base" folder (probably called Jedi Outcast\GameData)', mbConfirmation, MB_OK, IDOK);
+  end;
+  Result := True;
+end;

JKXR-PCVR-Installer/README.txt

@@ -0,0 +1,116 @@
+
+####################################################
+#  INSTALL AND RUN INSTRUCTIONS FOR JKXR FOR PCVR  #
+####################################################
+
+
+
+NOTES ON OPENXR
+===============
+
+
+This build of JKXR has so far only been tested on Meta and Pico devices. We recommend if you are using a Meta device that you set Oculus as the default OpenXR runtime. For all other devices you can set SteamVR as the OpenXR runtime. We're looking for feedback on what works and what doesn't (with Vive Wands expected not to work as yet - but still need info). If your headset manufacturer includes an OpenXR runtime better to use that.... use SteamVR as a fallback.
+
+
+
+
+STEAM INSTALLS
+==============
+
+Please note, any instructions below that are for Jedi Outcast, the exact same instructions are applicable to Jedi Academy, though the folder/file names need to be change as appropriate.
+
+
+To Install
+----------
+
+Simply double click on the file:   Steam__Install.bat
+
+This should copy all the necessary bits to the right places. 
+If it fails, then you will have to find your steam install folder and follow the non-steam instructions below.
+
+NOTE: If you've played JKO/JKA using OpenJK in the past, then there will probably be an old config file lying around that may mess stuff up.. browse to the install folder and delete openjo_sp.cfg or openjk_sp.cfg
+
+
+To Run
+------
+
+Simply double click on the file:   Steam__Run_JKXR.bat
+
+
+To Uninstall
+------------
+
+Simply double click on the file:   Steam__Uninstall.bat
+
+
+
+
+FOR OTHER (NON-STEAM)
+=====================
+
+Please note, the instructions below are for Jedi Outcast, the exact same instructions are applicable to Jedi Academy, though the folder names need to be change as appropriate.
+
+
+To Install
+----------
+
+You'll need to locate the folder in which your copy of Jedi Knight: Jedi Outcast/Academy is installed.
+
+
+For Jedi Outcast copy the following files into the same folder as the jk2sp.exe:
+
+openjk_sp.x86_64.exe
+jagamex86_64.dll
+rdsp-vanilla_x86_64.dll
+SDL2.dll
+
+
+For Jedi Academy copy the following files into the same folder as the jasp.exe:
+
+openjo_sp.x86_64.exe
+jospgamex86_64.dll
+rdjosp-vanilla_x86_64.dll
+SDL2.dll
+
+And copy all the pk3 files from the base folder into the base folder of your install.
+
+NOTE: If you've played JKO/JKA using OpenJK in the past, then there will probably be an old config file lying around that may mess stuff up.. browse to the install folder and delete openjo_sp.cfg or openjk_sp.cfg
+
+
+ANOTHER NOTE: Alternatively you can actually play JKXR from the extracted folder location.. all you need to do in that case is copy the pk3 files from your installation of Jedi Outcast/Academy into the base folder in the location you extracted the 7zip archive to. In this case if you are playing the single player campaign on flatscreen, none of the VR modifications will interfere with your game.
+
+
+To Start
+--------
+
+Simply double click the executable you copied in to your JKO install folder:  openjo_sp.x86_64.exe
+
+
+To Uninstall
+------------
+
+Delete all the files you copied over originally
+
+
+
+THINGS TO NOTE
+==============
+
+1. There are bugs - feedback appreciated
+2. You will probably have to map your controllers if you aren't using a Quest or a Pico as we've not touched any controller mappings and configuration yet
+3. If you have no sound, ensure the JKXR window has focus and that you have selected your headset as the primary sound output
+
+
+
+MODS
+====
+
+This package contains some mods, please see the packaged_mods_credits.txt file for credits
+
+We highly recommend the Expanded Menu for Jedi Outcast mod, this has a lot of excellent functionality:
+https://www.moddb.com/mods/jedi-outcast-expanded-menu
+
+We also recommend The Ladder for Jedi Outcast:
+https://mrwonko.de/jk3files/Jedi%20Outcast/Maps/Single%20Player/2198/
+
+Other mods will work with this build, however YMMV

JKXR-PCVR-Installer/packaged_mods_credits.txt

@@ -0,0 +1,192 @@
+The following excellent mods were included in the apk:
+
+
+
+=============================================================================================================================
+
+
+TITLE: Vince Crusty and Elin's VR Fully Modeled Weapons Pack
+AUTHORS: Elin and Vince Crusty
+FILE NAME: z_Crusty_and_Elin_vr_weapons.pk3
+FILE SIZE: 1.0 MB
+DATE RELEASED: 21 MAR 2023
+
+DESCRIPTION: This mod replaces all the Jedi Outcast weapons with fully modeled weapons for use in VR
+
+THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS.
+
+
+=============================================================================================================================
+
+
+Author:
+Grab
+
+File name:
+GGDynamicWeapons v1.0
+
+Description:
+Dynamic light for weapons effects
+
+Instalation:
+Take one of these .pk3's and put it into your base folder.
+
+Known issues:
+Probably only Seeker's shots are missing dynamic lightning. Might be fixed in future.
+
+Copyright:
+Grab
+
+
+=============================================================================================================================
+
+
+
+Readme File:
+JEDI KNIGHT: JEDI ACADEMY MODIFICATION
+**************************************
+
+Title : Episode 3: Revenge of the Sith Lightsaber Blades REVISED
+author : PK_Azlon
+email :digitalvapor@mac.com
+File Name :episode3blades.pk3
+
+
+Description: Due to feedback, and the fact that I myself was not satisfied with my previous release of this blade pack, I have completely remade the glows for my Episode 3: Revenge of the Sith Lightsaber Blades.
+Most people were unhappy with the sky blue blade, and after a 5th viewing of the movie, I was too. So I have gone back and made the blue closer to what is seen in the film, and also made the glows about 64 pixels thinner. While this introduces a little bit of grainyness, the overall blade looks much better.
+----------------------------------
+
+Installation: Extract  episode3sabers.pk3 into Jedi Academy's  /gamedata/base directory.
+This pack is made to replace the previous release, so if asked if you want to overwrite the existing copy (if you have it) Choose yes.
+
+
+New textures: YES!
+New Models: No
+
+Special thanks to Raven for making this game, and a VERY SPECIAL Thanks to George Lucas for making Star Wars Episode III: Revenge of the Sith so much better than Epidodes 1, 2, and 6
+
+
+Copyright / Permissions
+THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS.
+
+
+
+
+=============================================================================================================================
+
+
+
+
+
+
+******************************************
+JEDI KNIGHT II : JEDI OUTCAST MODIFICATION
+******************************************
+
+Title			: HapSlash's Improved Stormtrooper - JO
+Author			: HapSlash
+E-Mail			: slash_happy@yahoo.com
+Website			: www.hapslash.com
+
+File Name		: Haps-Stormtrooper.pk3
+File Size		: 1.23MB
+Date Released		: 02-27-04
+
+
+
+
+Description
+----------------------------------------------------------------------
+The first pk3 includes the Improved Stormtrooper model, which features accurate movie stylings, team skins, complete caps, and full LOD support .  This file is set up to replace the default Stormtrooper.
+
+Also included is a second pk3 which will replace the 3rd person 
+Stormtrooper blaster with my own version of the E-11.
+
+
+
+
+Installation
+----------------------------------------------------------------------
+Simply extract both pk3's to the gamedata/base folder of your Jedi Outcast 
+directory.
+
+
+
+
+Comments
+----------------------------------------------------------------------
+
+ First of all I think that thank's are in order to INFINITY BLADE, who 
+took the time to weight the model & convert it almost 5 times before the 
+finished product was released.  Without him this project never would have 
+gotten very far.
+
+I originally started this upgrade due to the number of problems I had 
+with the original. The main changes are primarily in the head, torso, 
+and knees, with texture changes throughout.  Other than the cosmetic 
+changes I also noticed that not all of the body sections had caps on 
+them, with this model I've added them all in.
+
+Well here it is, my first released model. A lot of hard work, blood, 
+sweat, tears, and almost a years worth of procrastination went into this,...  
+
+Enjoy.
+
+
+
+======================================================================
+THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS.
+
+
+
+
+*******************************************
+JEDI KNIGHT III : JEDI ACADEMY MODIFICATION
+*******************************************
+
+Title : DT Stormtrooper ROTJ 2.0
+Author : DT
+Version : 2.0
+File Size : 3.2 MB
+Date Released : September 6, 2013
+
+Model : DT
+Textures : DT
+Weighting : DT
+
+
+
+Description:
+----------------------------------------------------------------------
+Stormtrooper, as seen in Return of the Jedi. Specular & slight gloss added. SP PK3 Included to replace base JKA Stormtrooper.
+
+
+Known Bugs:
+
+- Slight clipping in certain animations, unavoidable thanks to the JKA skeleton.
+
+
+Bot: Yes.
+NPC: Yes.
+LODs: Yes.
+Team Skins: Yes.
+SP Replacement: Yes.
+SP Customise Menu: No.
+
+
+Credits:
+
+----------------------------------------------------------------------
+
+Thanks to Circa for making the SP replacement for me. :)
+
+
+
+Installation:
+----------------------------------------------------------------------
+
+Simply extract the pk3(s) to the gamedata/base folder of your Jedi Academy directory.
+
+======================================================================
+THIS MODIFICATION IS NOT MADE, DISTRIBUTED, OR SUPPORTED BY ACTIVISION, RAVEN, OR LUCASARTS ENTERTAINMENT COMPANY LLC. ELEMENTS TM & © LUCASARTS ENTERTAINMENT COMPANY LLC AND/OR ITS LICENSORS.
+

Projects/Android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.jkxr"
 		android:versionCode="64"
-		android:versionName="1.1.20" android:installLocation="auto" >
+		android:versionName="1.1.21" android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
 	<uses-feature android:glEsVersion="0x00030002" android:required="true"/>

Projects/Android/jni/OpenJK/JKXR/android/JKXR_SurfaceView.cpp

@@ -349,7 +349,7 @@ void VR_Init()
 	vr_force_motion_push = Cvar_Get ("vr_force_motion_push", "3", CVAR_ARCHIVE);
 	vr_force_motion_pull = Cvar_Get ("vr_force_motion_pull", "4", CVAR_ARCHIVE);
 	vr_motion_enable_saber = Cvar_Get ("vr_motion_enable_saber", "0", CVAR_ARCHIVE);
-	vr_always_run = Cvar_Get ("vr_always_run", "0", CVAR_ARCHIVE);
+	vr_always_run = Cvar_Get ("vr_always_run", "1", CVAR_ARCHIVE);
 	vr_crouch_toggle = Cvar_Get ("vr_crouch_toggle", "0", CVAR_ARCHIVE);
 	vr_irl_crouch_enabled = Cvar_Get ("vr_irl_crouch_enabled", "0", CVAR_ARCHIVE);
 	vr_irl_crouch_to_stand_ratio = Cvar_Get ("vr_irl_crouch_to_stand_ratio", "0.65", CVAR_ARCHIVE);

Projects/Android/jni/OpenJK/JKXR/windows/JKXR_SurfaceView.cpp

@@ -260,7 +260,7 @@ void VR_Init()
 	vr_force_motion_push = Cvar_Get ("vr_force_motion_push", "3", CVAR_ARCHIVE);
 	vr_force_motion_pull = Cvar_Get ("vr_force_motion_pull", "4", CVAR_ARCHIVE);
 	vr_motion_enable_saber = Cvar_Get ("vr_motion_enable_saber", "0", CVAR_ARCHIVE);
-	vr_always_run = Cvar_Get ("vr_always_run", "0", CVAR_ARCHIVE);
+	vr_always_run = Cvar_Get ("vr_always_run", "1", CVAR_ARCHIVE);
 	vr_crouch_toggle = Cvar_Get ("vr_crouch_toggle", "0", CVAR_ARCHIVE);
 	vr_irl_crouch_enabled = Cvar_Get ("vr_irl_crouch_enabled", "0", CVAR_ARCHIVE);
 	vr_irl_crouch_to_stand_ratio = Cvar_Get ("vr_irl_crouch_to_stand_ratio", "0.65", CVAR_ARCHIVE);

Projects/Android/jni/OpenJK/code/qcommon/q_shared.h

@@ -68,7 +68,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #if JK2_MODE
 #define PRODUCT_NAME			"openjo_sp"
 
-#define CLIENT_WINDOW_TITLE "OpenJO (SP)"
+#define CLIENT_WINDOW_TITLE "JKXR Jedi Outcast"
 #define CLIENT_CONSOLE_TITLE "OpenJO Console (SP)"
 #define HOMEPATH_NAME_UNIX "openjo"
 #define HOMEPATH_NAME_WIN "OpenJO"
@@ -76,7 +76,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #else
 #define PRODUCT_NAME			"openjk_sp"
 
-#define CLIENT_WINDOW_TITLE "OpenJK (SP)"
+#define CLIENT_WINDOW_TITLE "JKXR Jedi Academy"
 #define CLIENT_CONSOLE_TITLE "OpenJK Console (SP)"
 #define HOMEPATH_NAME_UNIX "openjk"
 #define HOMEPATH_NAME_WIN "OpenJK"

Projects/Android/jni/OpenJK/code/qcommon/stv_version.h

@@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 // Current version of the single player game
 #include "../win32/AutoVersion.h"
 
-#define JKXR_VERSION		"1.1.20-ea"
+#define JKXR_VERSION		"1.1.21-ea"
 
 #ifdef _DEBUG
 	#define	Q3_VERSION		"(debug)OpenJK: v" VERSION_STRING_DOTTED "  JKXR: " JKXR_VERSION

Projects/Android/jni/OpenJK/code/rd-vanilla/tr_init.cpp

@@ -1540,7 +1540,7 @@ void R_Register( void )
 	r_mapOverBrightBits = ri.Cvar_Get( "r_mapOverBrightBits", "0", CVAR_ARCHIVE_ND|CVAR_LATCH );
 	r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE_ND | CVAR_LATCH );
 	r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "4", CVAR_ARCHIVE_ND | CVAR_LATCH);
+	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "0", CVAR_ARCHIVE_ND | CVAR_LATCH);
 	ri.Cvar_CheckRange( r_subdivisions, 0, 80, qfalse );
 	r_intensity = ri.Cvar_Get ("r_intensity", "1.07", CVAR_LATCH|CVAR_ARCHIVE );
 
@@ -1553,7 +1553,7 @@ void R_Register( void )
 	//
 	// archived variables that can change at any time
 	//
-	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE_ND );
+	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "5000", CVAR_ARCHIVE_ND );
 	r_lodbias = ri.Cvar_Get( "r_lodbias", "-2", CVAR_ARCHIVE_ND );
 	r_flares = ri.Cvar_Get ("r_flares", "1", CVAR_ARCHIVE_ND );
 	r_lodscale = ri.Cvar_Get( "r_lodscale", "10", CVAR_ARCHIVE_ND );

z_vr_assets_jka/weapons_vr.cfg

@@ -11,6 +11,7 @@ seta vr_weapon_adjustment_12 "-1.425,-1.900,4.100,-9.320,-164.401,-15.500,73.499
 seta vr_weapon_adjustment_13 "1.000,-3.980,7.680,-11.200,0.000,0.000,-1.800"
 seta vr_weapon_adjustment_14 "0.52,-12.87,13.29,-22.09,11.30,26.60,-3.40"
 seta vr_weapon_adjustment_18 "0.510,-8.235,10.706,-3.922,-5.600,0.400,0.000"
+seta vr_weapon_adjustment_17 "1.000,-6.860,12.340,-4.600,-49.700,0.000,0.000"
 seta vr_weapon_adjustment_19 "0.43,-8.97,13.22,-21.68,-4.80,-4.50,-0.40"
 seta vr_weapon_adjustment_2 "1.000,-3.920,8.480,-14.100,0.000,0.000,0.000"
 seta vr_weapon_adjustment_20 "0.44,-13.55,12.79,-26.06,0.30,-1.40,-0.40"