mirror of
https://github.com/DrBeef/JKXR.git
synced 2024-11-10 06:42:17 +00:00
Installer and cvar changes
This commit is contained in:
parent
5758f29d34
commit
8c3fa38e30
8 changed files with 82 additions and 10 deletions
|
@ -2,7 +2,7 @@
|
|||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "JKXR - Jedi Academy"
|
||||
#define MyAppVersion "1.0.20"
|
||||
#define MyAppVersion "1.0.21"
|
||||
#define MyAppPublisher "Team Beef VR"
|
||||
#define MyAppURL "https://www.patreon.com/teambeef"
|
||||
#define MyAppExeName "openjk_sp.x86_64.exe"
|
||||
|
@ -29,6 +29,7 @@ SolidCompression=yes
|
|||
WizardStyle=modern
|
||||
AlwaysShowDirOnReadyPage=yes
|
||||
AppendDefaultDirName=no
|
||||
DisableWelcomePage=yes
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
@ -41,8 +42,10 @@ Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKA\{#MyAppExeName}"; DestDir: "{
|
|||
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]
|
||||
|
@ -52,3 +55,36 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
|
|||
[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;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "JKXR - Jedi Outcast"
|
||||
#define MyAppVersion "1.0.20"
|
||||
#define MyAppVersion "1.0.21"
|
||||
#define MyAppPublisher "Team Beef VR"
|
||||
#define MyAppURL "https://www.patreon.com/teambeef"
|
||||
#define MyAppExeName "openjo_sp.x86_64.exe"
|
||||
|
@ -29,6 +29,7 @@ SolidCompression=yes
|
|||
WizardStyle=modern
|
||||
AlwaysShowDirOnReadyPage=yes
|
||||
AppendDefaultDirName=no
|
||||
DisableWelcomePage=yes
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
@ -42,7 +43,9 @@ Source: "C:\Dev\Quest\JKXR\JKXR-PCVR-Installer\JKO\jospgamex86_64.dll"; DestDir:
|
|||
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]
|
||||
|
@ -52,3 +55,36 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
|
|||
[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;
|
||||
|
|
BIN
JKXR-PCVR-Installer/vr_splash.bmp
Normal file
BIN
JKXR-PCVR-Installer/vr_splash.bmp
Normal file
Binary file not shown.
After Width: | Height: | Size: 1 MiB |
|
@ -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"/>
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 );
|
||||
|
|
Loading…
Reference in a new issue