[nexuiz-commits] r7802 - in branches/nexuiz-2.0: . data data/qcsrc/menu/nexuiz data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Sep 15 05:39:13 EDT 2009


Author: div0
Date: 2009-09-15 05:39:12 -0400 (Tue, 15 Sep 2009)
New Revision: 7802

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/tooltips.db
   branches/nexuiz-2.0/data/weapons.cfg
   branches/nexuiz-2.0/data/weaponsHavoc.cfg
Log:
r7775 | fruitiex | 2009-09-13 15:01:51 -0400 (Sun, 13 Sep 2009) | 2 lines
g_waypoinstprite_alpha cvar 


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/.patchsets	2009-09-15 09:39:12 UTC (rev 7802)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-15 09:39:12 UTC (rev 7802)
@@ -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 eb7c0e20fc7d499b26521052ddcc4d80
+set cvar_check_default ce0cb3a86b732067e5fb7347c0e0fb74
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1165,6 +1165,7 @@
 set g_waypointsprite_limitedrange 5120
 set g_waypointsprite_stuffbinds 0
 seta g_waypointsprite_scale 1
+seta g_waypointsprite_alpha 1 "This allows the client to control transparency of the waypoint"
 alias "g_waypointsprite_personal"	"impulse 30"
 alias "g_waypointsprite_personal_p"	"impulse 31"
 alias "g_waypointsprite_personal_d"	"impulse 32"

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c	2009-09-15 09:39:12 UTC (rev 7802)
@@ -93,6 +93,11 @@
 			me.TD(me, 1, 3, e = makeNexuizSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));
 				setDependent(e, "cl_hidewaypoints", 0, 0);
 	me.TR(me);
+ 		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Waypoint alpha:"));
+			me.TD(me, 1, 3, e = makeNexuizSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));
+				setDependent(e, "cl_hidewaypoints", 0, 0);
+	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Show names:"));
 		me.TD(me, 1, 3, e = makeNexuizTextSlider("cl_shownames"));

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-15 09:39:12 UTC (rev 7802)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "ff4c4b4c9c9574b0d647c023021a8956";
-string CVAR_CHECK_WEAPONS = "eead6b984631a74c8337b1bf9756cfc9";
+string CVAR_CHECK_DEFAULT = "ce0cb3a86b732067e5fb7347c0e0fb74";
+string CVAR_CHECK_WEAPONS = "c55b862a83b1579ec2996cb2f92b819d";
 
 float	FALSE					= 0;
 float	TRUE					= 1;

Modified: branches/nexuiz-2.0/data/tooltips.db
===================================================================
--- branches/nexuiz-2.0/data/tooltips.db	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/tooltips.db	2009-09-15 09:39:12 UTC (rev 7802)
@@ -213,6 +213,7 @@
 \sbar_color_bg_team\Team color saturation of the HUD background
 \cl_hidewaypoints\Show various gametype specific waypoints
 \g_waypointsprite_scale\Scale multiplier of the waypoints
+\g_waypointsprite_alpha\Control transparency of the waypoints
 \cl_shownames\Show the name of the player you are aiming at
 
 \crosshair_hittest\None: do not do hit tests for the crosshair; TrueAim: blur the crosshair when you would not hit the wall; Enemies: also enlarge the crosshair when you would hit an enemy

Modified: branches/nexuiz-2.0/data/weapons.cfg
===================================================================
--- branches/nexuiz-2.0/data/weapons.cfg	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/weapons.cfg	2009-09-15 09:39:12 UTC (rev 7802)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit weaponsHavoc.cfg too.
 
-set cvar_check_weapons eead6b984631a74c8337b1bf9756cfc9
+set cvar_check_weapons c55b862a83b1579ec2996cb2f92b819d
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!

Modified: branches/nexuiz-2.0/data/weaponsHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/weaponsHavoc.cfg	2009-09-15 09:33:33 UTC (rev 7801)
+++ branches/nexuiz-2.0/data/weaponsHavoc.cfg	2009-09-15 09:39:12 UTC (rev 7802)
@@ -1,4 +1,4 @@
-set cvar_check_weapons eead6b984631a74c8337b1bf9756cfc9
+set cvar_check_weapons c55b862a83b1579ec2996cb2f92b819d
 
 // NOTE: this only replaces weapons on the map
 // use g_start_weapon_* to also replace the on-startup weapons!



More information about the nexuiz-commits mailing list