From 61edcb37e1241f6dee07209f7fb535d8dc6eacc3 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sun, 13 Sep 2009 19:01:51 +0000 Subject: [PATCH] g_waypoinstprite_alpha cvar git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7775 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 3 ++- .../qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c | 5 +++++ data/qcsrc/server/constants.qh | 4 ++-- data/tooltips.db | 1 + data/weapons.cfg | 2 +- data/weapons25.cfg | 2 +- data/weaponsHavoc.cfg | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 61a8ad955..ea5255f0b 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -26,7 +26,7 @@ if_dedicated alias if_client "" 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 2ea0e137167573daca65d7dcdd551c32 +set cvar_check_default ce0cb3a86b732067e5fb7347c0e0fb74 // Nexuiz version (formatted for machines) // used to determine if a client version is compatible @@ -1173,6 +1173,7 @@ set g_waypointsprite_deadlifetime 1 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" diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c index bff0846b1..2d89590e9 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_radar.c @@ -92,6 +92,11 @@ void fillNexuizRadarDialog(entity me) me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Waypoint scale:")); 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:")); diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index b91aec8ba..b6231d6d8 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,5 +1,5 @@ -string CVAR_CHECK_DEFAULT = "2ea0e137167573daca65d7dcdd551c32"; -string CVAR_CHECK_WEAPONS = "a9a1a05cc77ef9ae1bb57e431d22eb47"; +string CVAR_CHECK_DEFAULT = "ce0cb3a86b732067e5fb7347c0e0fb74"; +string CVAR_CHECK_WEAPONS = "c55b862a83b1579ec2996cb2f92b819d"; float FALSE = 0; float TRUE = 1; diff --git a/data/tooltips.db b/data/tooltips.db index db17876a8..f9c1e8396 100644 --- a/data/tooltips.db +++ b/data/tooltips.db @@ -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 diff --git a/data/weapons.cfg b/data/weapons.cfg index d67c88cb2..c3d899ebb 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit weaponsHavoc.cfg too. -set cvar_check_weapons a9a1a05cc77ef9ae1bb57e431d22eb47 +set cvar_check_weapons c55b862a83b1579ec2996cb2f92b819d // NOTE: this only replaces weapons on the map // use g_start_weapon_* to also replace the on-startup weapons! diff --git a/data/weapons25.cfg b/data/weapons25.cfg index a062c4d99..6374a3c39 100644 --- a/data/weapons25.cfg +++ b/data/weapons25.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit weaponsHavoc.cfg too. -set cvar_check_weapons a9a1a05cc77ef9ae1bb57e431d22eb47 +set cvar_check_weapons c55b862a83b1579ec2996cb2f92b819d // NOTE: this only replaces weapons on the map // use g_start_weapon_* to also replace the on-startup weapons! diff --git a/data/weaponsHavoc.cfg b/data/weaponsHavoc.cfg index c35f249db..f3d0a29de 100644 --- a/data/weaponsHavoc.cfg +++ b/data/weaponsHavoc.cfg @@ -1,4 +1,4 @@ -set cvar_check_weapons a9a1a05cc77ef9ae1bb57e431d22eb47 +set cvar_check_weapons c55b862a83b1579ec2996cb2f92b819d // NOTE: this only replaces weapons on the map // use g_start_weapon_* to also replace the on-startup weapons! -- 2.39.2