[nexuiz-commits] r8098 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Oct 11 08:30:17 EDT 2009


Author: div0
Date: 2009-10-11 08:30:15 -0400 (Sun, 11 Oct 2009)
New Revision: 8098

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/balance.cfg
   branches/nexuiz-2.0/data/balance25.cfg
   branches/nexuiz-2.0/data/balanceHavoc.cfg
   branches/nexuiz-2.0/data/balanceNexrun.cfg
   branches/nexuiz-2.0/data/balanceSamual.cfg
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r8089 | samual | 2009-10-10 23:04:13 +0200 (Sat, 10 Oct 2009) | 1 line
Fix scoreboard for those who have an earlier version of Nexuiz.... (The cvars didn't exist before, so they were blank to older clients)
r8093 | div0 | 2009-10-11 12:48:30 +0200 (Sun, 11 Oct 2009) | 2 lines
rescan_pendign cvar (to schedule a fs_rescan later)
r8094 | div0 | 2009-10-11 13:33:31 +0200 (Sun, 11 Oct 2009) | 2 lines
show aiming direction on player models using a REALLY stupid way (cvar controlled)
r8095 | div0 | 2009-10-11 13:36:06 +0200 (Sun, 11 Oct 2009) | 2 lines
make a cvar control the model sanity fix
r8096 | div0 | 2009-10-11 13:38:09 +0200 (Sun, 11 Oct 2009) | 2 lines
cvar checksums


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/.patchsets	2009-10-11 12:30:15 UTC (rev 8098)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086,8089-8089,8093-8096

Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/balance.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/balance25.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/balanceNexrun.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceNexrun.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/balanceNexrun.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-10-11 12:30:15 UTC (rev 8098)
@@ -26,7 +26,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 37cc3aae4b042acd9cf2b71135034bcf
+set cvar_check_default 5d48426c72cdfbf78480870c75601f89
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1654,3 +1654,9 @@
 seta cl_noantilag 0 "turn this on if you believe antilag is bad"
 
 r_shadow_shadowmapping 1
+
+set sv_pitch_min -35 "minimum aiming angle for shooting direction display of the gun"
+set sv_pitch_max  35 "maximum aiming angle for shooting direction display of the gun"
+set sv_pitch_fixyaw 1 "workaround to fix the aiming direction on stupidly made player models, FIXME fix the models and set this to 0"
+
+set rescan_pending 0 "set to 1 to schedule a fs_rescan at the end of this match"

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-10-11 12:30:15 UTC (rev 8098)
@@ -1135,13 +1135,34 @@
 
 	if not(sbar_scoreboard_fade_alpha)
 		return;
+		
 	sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha;
-	sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha;
+	if(cvar("sbar_scoreboard_alpha_fg"))
+		sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha;
+	else 
+		sbar_scoreboard_alpha_fg = 1;
+	
 	sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
-	sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha;
-	sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha;
-	sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha;
-	sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha;
+	
+	if(cvar("sbar_scoreboard_highlight_alpha"))
+		sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha;
+	else
+		sbar_scoreboard_highlight_alpha = 0.10;
+		
+	if(cvar("sbar_scoreboard_highlight_alpha_self"))
+		sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha;
+	else
+		sbar_scoreboard_highlight_alpha_self = 0.25;
+		
+	if(cvar("sbar_scoreboard_alpha_name"))
+		sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha;
+	else
+		sbar_scoreboard_alpha_name = 0.9;
+		
+	if(cvar("sbar_scoreboard_alpha_name_self"))
+		sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha;
+	else 
+		sbar_scoreboard_alpha_name_self = 1;
 
 	vector rgb, pos, tmp;
 	entity pl, tm;

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2009-10-11 12:30:15 UTC (rev 8098)
@@ -737,6 +737,7 @@
 void CL_ExteriorWeaponentity_Think()
 {
 	float tag_found;
+	vector ang;
 	self.nextthink = time;
 	if (self.owner.exteriorweaponentity != self)
 	{
@@ -777,6 +778,29 @@
 	else
 		self.alpha = 1;
 
+	ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max);
+	ang_y = 0;
+	ang_z = 0;
+
+	if(sv_pitch_fixyaw) // workaround for stupid player models that don't aim forward
+	{
+		ang_y = self.owner.v_angle_y;
+		makevectors(ang);
+		var vector v = v_forward;
+		gettaginfo(self.tag_entity, self.tag_index);
+		// untransform v according to this coordinate space
+		vector w;
+		w_x = v_forward * v;
+		w_y = -v_right * v;
+		w_z = v_up * v;
+		self.angles = vectoangles(w);
+	}
+	else
+	{
+		ang_x = -/* don't ask */ang_x;
+		self.angles = ang;
+	}
+
 	self.colormap = self.owner.colormap;
 };
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-11 12:30:15 UTC (rev 8098)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "37cc3aae4b042acd9cf2b71135034bcf";
-string CVAR_CHECK_BALANCE = "1e423b95c67bac7998289473abe8feb1";
+string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
+string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
 
 float	FALSE					= 0;
 float	TRUE					= 1;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-10-11 12:30:15 UTC (rev 8098)
@@ -2477,6 +2477,26 @@
 
 	if(!mapvote_initialized)
 	{
+		if(cvar("rescan_pending") == 1)
+		{
+			cvar_set("rescan_pending", "2");
+			localcmd("fs_rescan\nrescan_pending 3\n");
+			return;
+		}
+		else if(cvar("rescan_pending") == 2)
+		{
+			return;
+		}
+		else if(cvar("rescan_pending") == 3)
+		{
+			// now build missing mapinfo files
+			if(!MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 1))
+				return;
+
+			// we're done, start the timer
+			cvar_set("rescan_pending", "0");
+		}
+
 		mapvote_initialized = TRUE;
 		if(DoNextMapOverride())
 			return;

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-10-11 12:06:34 UTC (rev 8097)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-10-11 12:30:15 UTC (rev 8098)
@@ -1085,6 +1085,10 @@
 float sv_autotaunt;
 float sv_taunt;
 
+float sv_pitch_min;
+float sv_pitch_max;
+float sv_pitch_fixyaw;
+
 void readlevelcvars(void)
 {
     g_bugrigs = cvar("g_bugrigs");
@@ -1211,6 +1215,10 @@
     if not(inWarmupStage)
         game_starttime                 = cvar("g_start_delay");
 
+	sv_pitch_min = cvar("sv_pitch_min");
+	sv_pitch_max = cvar("sv_pitch_max");
+	sv_pitch_fixyaw = cvar("sv_pitch_fixyaw");
+
     readplayerstartcvars();
 }
 



More information about the nexuiz-commits mailing list