[nexuiz-commits] r8336 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Nov 29 09:03:23 EST 2009
Author: div0
Date: 2009-11-29 09:03:22 -0500 (Sun, 29 Nov 2009)
New Revision: 8336
Modified:
trunk/data/balance.cfg
trunk/data/balance25.cfg
trunk/data/balanceHavoc.cfg
trunk/data/balanceNexrun.cfg
trunk/data/balanceSamual.cfg
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/t_items.qc
Log:
fix SOME missing cvars
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/balance.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -451,6 +451,7 @@
// }}}
// {{{ porto
set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
set g_balance_porto_primary_speed 2000
set g_balance_porto_primary_lifetime 30
set g_balance_portal_health 200 // these get recharged whenever the portal is used
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/balance25.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -451,6 +451,7 @@
// }}}
// {{{ porto
set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
set g_balance_porto_primary_speed 2000
set g_balance_porto_primary_lifetime 30
set g_balance_portal_health 200 // these get recharged whenever the portal is used
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/balanceHavoc.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -451,6 +451,7 @@
// }}}
// {{{ porto
set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
set g_balance_porto_primary_speed 2000
set g_balance_porto_primary_lifetime 30
set g_balance_portal_health 200 // these get recharged whenever the portal is used
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/balanceNexrun.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -452,6 +452,7 @@
// }}}
// {{{ porto
set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
set g_balance_porto_primary_speed 5000
set g_balance_porto_primary_lifetime 30
set g_balance_portal_health 200 // these get recharged whenever the portal is used
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/balanceSamual.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -452,6 +452,7 @@
// }}}
// {{{ porto
set g_balance_porto_primary_refire 1.5
+set g_balance_porto_primary_animtime 0.3
set g_balance_porto_primary_speed 5000
set g_balance_porto_primary_lifetime 30
set g_balance_portal_health 200 // these get recharged whenever the portal is used
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/defaultNexuiz.cfg 2009-11-29 14:03:22 UTC (rev 8336)
@@ -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 183061c914dc70b947ff76dfb9c52781
+set cvar_check_default 69623911fa2fbe35f109b546de468762
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -507,6 +507,8 @@
seta captureleadlimit_override -1 "Capture llead imit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_ctf_capture_limit -1 "CTF capture limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_ctf_capture_leadlimit -1 "CTF capture lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_arena_point_limit -1 "Arena point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_arena_point_leadlimit -1 "Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_domination_point_limit -1 "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_domination_point_leadlimit -1 "Domination point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_runematch_point_limit -1 "Runematch point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
@@ -1704,3 +1706,11 @@
set g_mutatormsg "" "mutator message"
set speedmeter 0 "print landing speeds"
set developer_shtest 0 "experimental speedhack detection"
+
+// debug cvars for keyhunt attaching
+set _angles "0 0 0"
+set _origin "0 0 0"
+
+// campaign internal, set when loading a campaign map1G
+set _campaign_index ""
+set _campaign_name ""
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-11-29 14:03:22 UTC (rev 8336)
@@ -892,8 +892,6 @@
self.strength_finished = 0;
self.invincible_finished = 0;
self.pushltime = 0;
- //self.speed_finished = 0;
- //self.slowmo_finished = 0;
// players have no think function
self.think = SUB_Null;
self.nextthink = 0;
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/qcsrc/server/constants.qh 2009-11-29 14:03:22 UTC (rev 8336)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "183061c914dc70b947ff76dfb9c52781";
+string CVAR_CHECK_DEFAULT = "69623911fa2fbe35f109b546de468762";
string CVAR_CHECK_BALANCE = "84d3d5976dd5870e8fc739c8f2a6451a";
float FALSE = 0;
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2009-11-29 13:49:37 UTC (rev 8335)
+++ trunk/data/qcsrc/server/t_items.qc 2009-11-29 14:03:22 UTC (rev 8336)
@@ -419,16 +419,6 @@
pickedup = TRUE;
player.invincible_finished = max(player.invincible_finished, time) + cvar("g_balance_powerup_invincible_time");
}
- //if (item.speed_finished)
- //{
- // pickedup = TRUE;
- // player.speed_finished = max(player.speed_finished, time) + cvar("g_balance_powerup_speed_time");
- //}
- //if (item.slowmo_finished)
- //{
- // pickedup = TRUE;
- // player.slowmo_finished = max(player.slowmo_finished, time) + (cvar("g_balance_powerup_slowmo_time") * cvar("g_balance_powerup_slowmo_speed"));
- //}
if (item.health)
if (player.health < item.max_health)
More information about the nexuiz-commits
mailing list