teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 06:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Master Server address change

Browse source 
- Change cvar name (vr_master) and value to use mp.quakevr.com:27950
- Added Omarlego's background pak
This commit is contained in:
Simon 2022-05-23 21:11:10 +01:00
parent bd0592dcc7
commit 023d0f27a8
12 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drbeef.ioq3quest" package="com.drbeef.ioq3quest"
android:installLocation="preferExternal" android:installLocation="preferExternal"
android:versionCode="53" android:versionCode="56"
android:versionName="1.1.0"> android:versionName="1.1.1">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
<uses-feature android:glEsVersion="0x00030001" /> <uses-feature android:glEsVersion="0x00030001" />
<!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>--> <!-- <uses-feature android:name="oculus.software.overlay_keyboard" android:required="false"/>-->

2
android/app/src/main/assets/autoexec.cfg
View file

@ -1,4 +1,4 @@
set sv_master1 "13.36.227.32:27950" set vr_master1 "mp.quakevr.com:27950"
////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////
// // // //

2
android/app/src/main/assets/autoexec_oa.cfg
View file

@ -1,4 +1,4 @@
set sv_master1 "13.36.227.32:27950" set vr_master1 "mp.quakevr.com:27950"
set vr_weapon_adjustment_1 "1.0,0,12,-13,-36,0,100" set vr_weapon_adjustment_1 "1.0,0,12,-13,-36,0,100"
set vr_weapon_adjustment_2 "1.0,-6,6,-3,0,0,0" set vr_weapon_adjustment_2 "1.0,-6,6,-3,0,0,0"

BIN
android/app/src/main/assets/z_custom_background66.pk3 Normal file
View file

Binary file not shown.

4
android/app/src/main/cpp/code/client/cl_main.c
View file

@ -4198,7 +4198,7 @@ void CL_GlobalServers_f( void ) {
int numAddress = 0; int numAddress = 0;
for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) { for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
sprintf(command, "sv_master%d", i); sprintf(command, "vr_master%d", i);
masteraddress = Cvar_VariableString(command); masteraddress = Cvar_VariableString(command);
if(!*masteraddress) if(!*masteraddress)
@ -4216,7 +4216,7 @@ void CL_GlobalServers_f( void ) {
return; return;
} }
sprintf(command, "sv_master%d", masterNum); sprintf(command, "vr_master%d", masterNum);
masteraddress = Cvar_VariableString(command); masteraddress = Cvar_VariableString(command);
if(!*masteraddress) if(!*masteraddress)

4
android/app/src/main/cpp/code/q3_ui/ui_servers2.c
View file

@ -1126,7 +1126,7 @@ int ArenaServers_SetType( int type )
if(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5) if(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5)
{ {
char masterstr[2], cvarname[sizeof("sv_master1")]; char masterstr[2], cvarname[sizeof("vr_master1")];
int direction; int direction;
if (type == g_servertype || type == ((g_servertype+1) % UIAS_NUM_SOURCES)) { if (type == g_servertype || type == ((g_servertype+1) % UIAS_NUM_SOURCES)) {
@ -1137,7 +1137,7 @@ int ArenaServers_SetType( int type )
while(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5) while(type >= UIAS_GLOBAL1 && type <= UIAS_GLOBAL5)
{ {
Com_sprintf(cvarname, sizeof(cvarname), "sv_master%d", type - UIAS_GLOBAL0); Com_sprintf(cvarname, sizeof(cvarname), "vr_master%d", type - UIAS_GLOBAL0);
trap_Cvar_VariableStringBuffer(cvarname, masterstr, sizeof(masterstr)); trap_Cvar_VariableStringBuffer(cvarname, masterstr, sizeof(masterstr));
if(*masterstr) if(*masterstr)
break; break;

2
android/app/src/main/cpp/code/server/server.h
View file

@ -274,7 +274,7 @@ extern cvar_t *sv_maxclients;
extern cvar_t *sv_privateClients; extern cvar_t *sv_privateClients;
extern cvar_t *sv_hostname; extern cvar_t *sv_hostname;
extern cvar_t *sv_master[MAX_MASTER_SERVERS]; extern cvar_t *vr_master[MAX_MASTER_SERVERS];
extern cvar_t *sv_reconnectlimit; extern cvar_t *sv_reconnectlimit;
extern cvar_t *sv_showloss; extern cvar_t *sv_showloss;
extern cvar_t *sv_padPackets; extern cvar_t *sv_padPackets;

8
android/app/src/main/cpp/code/server/sv_init.c
View file

@ -672,11 +672,11 @@ void SV_Init (void)
sv_allowDownload = Cvar_Get ("sv_allowDownload", "1", CVAR_SERVERINFO); sv_allowDownload = Cvar_Get ("sv_allowDownload", "1", CVAR_SERVERINFO);
Cvar_Get ("sv_dlURL", "", CVAR_SERVERINFO | CVAR_ARCHIVE); Cvar_Get ("sv_dlURL", "", CVAR_SERVERINFO | CVAR_ARCHIVE);
sv_master[0] = Cvar_Get("sv_master1", "", 0); // This is set to our Q3Q master vr_master[0] = Cvar_Get("vr_master1", "mp.quakevr.com:27950", 0); // This is set to our Q3Q master
sv_master[1] = Cvar_Get("sv_master2", MASTER_SERVER_NAME, 0); vr_master[1] = Cvar_Get("vr_master2", MASTER_SERVER_NAME, 0);
sv_master[2] = Cvar_Get("sv_master3", "master.ioquake3.org", 0); vr_master[2] = Cvar_Get("vr_master3", "master.ioquake3.org", 0);
for(index = 3; index < MAX_MASTER_SERVERS; index++) for(index = 3; index < MAX_MASTER_SERVERS; index++)
sv_master[index] = Cvar_Get(va("sv_master%d", index + 1), "", CVAR_ARCHIVE); vr_master[index] = Cvar_Get(va("vr_master%d", index + 1), "", CVAR_ARCHIVE);
sv_reconnectlimit = Cvar_Get ("sv_reconnectlimit", "3", 0); sv_reconnectlimit = Cvar_Get ("sv_reconnectlimit", "3", 0);
sv_showloss = Cvar_Get ("sv_showloss", "0", 0); sv_showloss = Cvar_Get ("sv_showloss", "0", 0);

26
android/app/src/main/cpp/code/server/sv_main.c
View file

@ -41,7 +41,7 @@ cvar_t *sv_maxclients;
cvar_t *sv_privateClients; // number of clients reserved for password cvar_t *sv_privateClients; // number of clients reserved for password
cvar_t *sv_hostname; cvar_t *sv_hostname;
cvar_t *sv_master[MAX_MASTER_SERVERS]; // master server ip address cvar_t *vr_master[MAX_MASTER_SERVERS]; // master server ip address
cvar_t *sv_reconnectlimit; // minimum seconds between connect messages cvar_t *sv_reconnectlimit; // minimum seconds between connect messages
cvar_t *sv_showloss; // report when usercmds are lost cvar_t *sv_showloss; // report when usercmds are lost
cvar_t *sv_padPackets; // add nop bytes to messages cvar_t *sv_padPackets; // add nop bytes to messages
@ -262,20 +262,20 @@ void SV_MasterHeartbeat(const char *message)
// send to group masters // send to group masters
for (i = 0; i < MAX_MASTER_SERVERS; i++) for (i = 0; i < MAX_MASTER_SERVERS; i++)
{ {
if(!sv_master[i]->string[0]) if(!vr_master[i]->string[0])
continue; continue;
// see if we haven't already resolved the name or if it's been over 24 hours // see if we haven't already resolved the name or if it's been over 24 hours
// resolving usually causes hitches on win95, so only do it when needed // resolving usually causes hitches on win95, so only do it when needed
if (sv_master[i]->modified || svs.time > svs.masterResolveTime[i]) if (vr_master[i]->modified || svs.time > svs.masterResolveTime[i])
{ {
sv_master[i]->modified = qfalse; vr_master[i]->modified = qfalse;
svs.masterResolveTime[i] = svs.time + MASTERDNS_MSEC; svs.masterResolveTime[i] = svs.time + MASTERDNS_MSEC;
if(netenabled & NET_ENABLEV4) if(netenabled & NET_ENABLEV4)
{ {
Com_Printf("Resolving %s (IPv4)\n", sv_master[i]->string); Com_Printf("Resolving %s (IPv4)\n", vr_master[i]->string);
res = NET_StringToAdr(sv_master[i]->string, &adr[i][0], NA_IP); res = NET_StringToAdr(vr_master[i]->string, &adr[i][0], NA_IP);
if(res == 2) if(res == 2)
{ {
@ -284,15 +284,15 @@ void SV_MasterHeartbeat(const char *message)
} }
if(res) if(res)
Com_Printf( "%s resolved to %s\n", sv_master[i]->string, NET_AdrToStringwPort(adr[i][0])); Com_Printf( "%s resolved to %s\n", vr_master[i]->string, NET_AdrToStringwPort(adr[i][0]));
else else
Com_Printf( "%s has no IPv4 address.\n", sv_master[i]->string); Com_Printf( "%s has no IPv4 address.\n", vr_master[i]->string);
} }
if(netenabled & NET_ENABLEV6) if(netenabled & NET_ENABLEV6)
{ {
Com_Printf("Resolving %s (IPv6)\n", sv_master[i]->string); Com_Printf("Resolving %s (IPv6)\n", vr_master[i]->string);
res = NET_StringToAdr(sv_master[i]->string, &adr[i][1], NA_IP6); res = NET_StringToAdr(vr_master[i]->string, &adr[i][1], NA_IP6);
if(res == 2) if(res == 2)
{ {
@ -301,9 +301,9 @@ void SV_MasterHeartbeat(const char *message)
} }
if(res) if(res)
Com_Printf( "%s resolved to %s\n", sv_master[i]->string, NET_AdrToStringwPort(adr[i][1])); Com_Printf( "%s resolved to %s\n", vr_master[i]->string, NET_AdrToStringwPort(adr[i][1]));
else else
Com_Printf( "%s has no IPv6 address.\n", sv_master[i]->string); Com_Printf( "%s has no IPv6 address.\n", vr_master[i]->string);
} }
} }
@ -313,7 +313,7 @@ void SV_MasterHeartbeat(const char *message)
} }
Com_Printf ("Sending heartbeat to %s\n", sv_master[i]->string ); Com_Printf ("Sending heartbeat to %s\n", vr_master[i]->string );
// this command should be changed if the server info / status format // this command should be changed if the server info / status format
// ever incompatably changes // ever incompatably changes

4
android/app/src/main/cpp/code/ui/ui_main.c
View file

@ -2488,11 +2488,11 @@ static qboolean UI_NetSource_HandleKey(int flags, float *special, int key) {
if(ui_netSource.integer >= UIAS_GLOBAL1 && ui_netSource.integer <= UIAS_GLOBAL5) if(ui_netSource.integer >= UIAS_GLOBAL1 && ui_netSource.integer <= UIAS_GLOBAL5)
{ {
char masterstr[2], cvarname[sizeof("sv_master1")]; char masterstr[2], cvarname[sizeof("vr_master1")];
while(ui_netSource.integer >= UIAS_GLOBAL1 && ui_netSource.integer <= UIAS_GLOBAL5) while(ui_netSource.integer >= UIAS_GLOBAL1 && ui_netSource.integer <= UIAS_GLOBAL5)
{ {
Com_sprintf(cvarname, sizeof(cvarname), "sv_master%d", ui_netSource.integer - UIAS_GLOBAL0); Com_sprintf(cvarname, sizeof(cvarname), "vr_master%d", ui_netSource.integer - UIAS_GLOBAL0);
trap_Cvar_VariableStringBuffer(cvarname, masterstr, sizeof(masterstr)); trap_Cvar_VariableStringBuffer(cvarname, masterstr, sizeof(masterstr));
if(*masterstr) if(*masterstr)
break; break;

2
android/app/src/main/java/com/drbeef/ioq3quest/MainActivity.java
View file

@ -117,6 +117,8 @@ public class MainActivity extends SDLActivity // implements KeyEvent.Callback
// Copy our special pak file and demo // Copy our special pak file and demo
copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true); copy_asset("/sdcard/ioquake3Quest/baseq3", "pakQ3Q.pk3", true);
copy_asset("/sdcard/ioquake3Quest/baseq3", "pak0.pk3", false); copy_asset("/sdcard/ioquake3Quest/baseq3", "pak0.pk3", false);
//Copy Omarlego's excellent replacement background
copy_asset("/sdcard/ioquake3Quest/baseq3", "z_custom_background66.pk3", false);
// Cleanup incompatible shaders // Cleanup incompatible shaders
delete_asset("/sdcard/ioquake3Quest/baseq3/glsl"); delete_asset("/sdcard/ioquake3Quest/baseq3/glsl");

2
android/run.bat
View file

@ -3,7 +3,7 @@
setlocal setlocal
set BUILD_TYPE=release set BUILD_TYPE=release
set VERSION=1.1.0 set VERSION=1.1.1
@REM Define the following environment variables to sign a release build @REM Define the following environment variables to sign a release build
@REM set KEYSTORE= @REM set KEYSTORE=