mirror of
https://github.com/DrBeef/JKXR.git
synced 2024-11-10 06:42:17 +00:00
Don't use vid_restart, get user to manually restart JKXR on video settings change
This commit is contained in:
parent
84f257ac60
commit
e2c4cfd015
13 changed files with 34 additions and 18 deletions
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.drbeef.jkxr"
|
||||
android:versionCode="63"
|
||||
android:versionName="1.1.16" android:installLocation="auto" >
|
||||
android:versionCode="64"
|
||||
android:versionName="1.1.17" android:installLocation="auto" >
|
||||
|
||||
<!-- Tell the system this app requires OpenGL ES 3.1. -->
|
||||
<uses-feature android:glEsVersion="0x00030002" android:required="true"/>
|
||||
|
|
|
@ -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.16-ea"
|
||||
#define JKXR_VERSION "1.1.17-ea"
|
||||
|
||||
#ifdef _DEBUG
|
||||
#define Q3_VERSION "(debug)OpenJK: v" VERSION_STRING_DOTTED " JKXR: " JKXR_VERSION
|
||||
|
|
|
@ -4333,7 +4333,8 @@ void UI_UpdateVideoSetup ( void )
|
|||
// Cvar_Set ( "cg_shadows", Cvar_VariableString ( "ui_cg_shadows" ) );
|
||||
Cvar_Set ( "ui_r_modified", "0" );
|
||||
|
||||
Cbuf_ExecuteText( EXEC_APPEND, "vid_restart;" );
|
||||
//Don't do this - expect user to restart themselves
|
||||
//Cbuf_ExecuteText( EXEC_APPEND, "vid_restart;" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -4895,7 +4895,8 @@ void UI_UpdateVideoSetup ( void )
|
|||
trap->Cvar_Set ( "cg_shadows", UI_Cvar_VariableString ( "ui_cg_shadows" ) );
|
||||
trap->Cvar_Set ( "ui_r_modified", "0" );
|
||||
|
||||
trap->Cmd_ExecuteText( EXEC_APPEND, "vid_restart;" );
|
||||
//Don't do this - expect user to restart themselves
|
||||
//trap->Cmd_ExecuteText( EXEC_APPEND, "vid_restart;" );
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -526,4 +526,7 @@ LANG_ENGLISH "Refresh Rate (Standalone Only):"
|
|||
REFERENCE REFRESH_RATE_DESC
|
||||
LANG_ENGLISH "Select display refresh rate (72Hz is recommended for default graphics setup)."
|
||||
|
||||
REFERENCE RESTART_JKXR_TO_APPLY
|
||||
LANG_ENGLISH "You will need to manually restart JKXR."
|
||||
|
||||
ENDMARKER
|
||||
|
|
|
@ -697,4 +697,8 @@ REFERENCE REFRESH_RATE_DESC
|
|||
LANG_ENGLISH "Select display refresh rate (72Hz is recommended for default graphics setup)."
|
||||
LANG_FRENCH "#same"
|
||||
|
||||
REFERENCE RESTART_JKXR_TO_APPLY
|
||||
LANG_ENGLISH "You will need to manually restart JKXR."
|
||||
LANG_FRENCH "#same"
|
||||
|
||||
ENDMARKER
|
||||
|
|
|
@ -697,4 +697,8 @@ REFERENCE REFRESH_RATE_DESC
|
|||
LANG_ENGLISH "Select display refresh rate (72Hz is recommended for default graphics setup)."
|
||||
LANG_GERMAN "#same"
|
||||
|
||||
REFERENCE RESTART_JKXR_TO_APPLY
|
||||
LANG_ENGLISH "You will need to manually restart JKXR."
|
||||
LANG_GERMAN "#same"
|
||||
|
||||
ENDMARKER
|
||||
|
|
|
@ -697,4 +697,8 @@ REFERENCE REFRESH_RATE_DESC
|
|||
LANG_ENGLISH "Select display refresh rate (72Hz is recommended for default graphics setup)."
|
||||
LANG_SPANISH "#same"
|
||||
|
||||
REFERENCE RESTART_JKXR_TO_APPLY
|
||||
LANG_ENGLISH "You will need to manually restart JKXR."
|
||||
LANG_SPANISH "#same"
|
||||
|
||||
ENDMARKER
|
||||
|
|
|
@ -1327,8 +1327,7 @@
|
|||
{
|
||||
name vidrestart_text1
|
||||
group vidrestart
|
||||
text @MENUS_THIS_WILL_APPLY_VIDEO
|
||||
text2 @MENUS_AND_RETURNTO_GAME
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 230 290 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
text2aligny 18
|
||||
|
|
|
@ -1346,8 +1346,7 @@
|
|||
{
|
||||
name vidrestart_text1
|
||||
group vidrestart
|
||||
text @MENUS_THIS_WILL_APPLY_VIDEO
|
||||
text2 @MENUS_AND_RETURN_TO_THE_MAIN
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 230 290 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
text2aligny 18
|
||||
|
|
|
@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg
|
|||
ID 100
|
||||
REFERENCE MENUS_VR
|
||||
DESCRIPTION "VR Menu Localizations"
|
||||
COUNT 163
|
||||
COUNT 164
|
||||
INDEX 0
|
||||
{
|
||||
REFERENCE COMMON_CONTROLS_ITEM
|
||||
|
@ -819,3 +819,8 @@ INDEX 162
|
|||
REFERENCE REFRESH_RATE_DESC
|
||||
TEXT_LANGUAGE1 "Select display refresh rate (72Hz is recommended for default graphics setup)."
|
||||
}
|
||||
INDEX 163
|
||||
{
|
||||
REFERENCE RESTART_JKXR_TO_APPLY
|
||||
TEXT_LANGUAGE1 "You will need to manually restart JKXR."
|
||||
}
|
||||
|
|
|
@ -1531,8 +1531,7 @@
|
|||
{
|
||||
name vidrestart_text1
|
||||
group vidrestart
|
||||
text @MENUS3_INGAME_DEFAULT
|
||||
text2 @MENUS3_INGAME_DEFAULT2
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 230 290 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
text2aligny 18
|
||||
|
@ -2956,8 +2955,7 @@
|
|||
{
|
||||
name options
|
||||
group defaults
|
||||
text @MENUS3_INGAME_DEFAULT
|
||||
text2 @MENUS3_INGAME_DEFAULT2
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 231 300 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
textalignx 150
|
||||
|
|
|
@ -1631,8 +1631,7 @@
|
|||
{
|
||||
name vidrestart_text1
|
||||
group vidrestart
|
||||
text @MENUS0_THIS_WILL_APPLY_VIDEO
|
||||
text2 @MENUS0_AND_RETURN_TO_THE_MAIN
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 230 290 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
text2aligny 18
|
||||
|
@ -3165,8 +3164,7 @@
|
|||
{
|
||||
name options
|
||||
group defaults
|
||||
text @MENUS2_THIS_WILL_SET_ALL_GAME
|
||||
text2 @MENUS2_TO_THEIR_FACTORY_SETTINGS
|
||||
text @MENUS_VR_RESTART_JKXR_TO_APPLY
|
||||
rect 305 231 300 20
|
||||
textalign ITEM_ALIGN_CENTER
|
||||
textalignx 150
|
||||
|
|
Loading…
Reference in a new issue