From: Mario <zacjardine@y7mail.com>
Date: Fri, 14 Nov 2014 08:37:11 +0000 (+1100)
Subject: Merge branch 'master' into Mario/despawn_effects
X-Git-Tag: xonotic-v0.8.0~152^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf825a0dada529d1288564e23223061429d01f31;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/despawn_effects
---

bf825a0dada529d1288564e23223061429d01f31
diff --cc qcsrc/server/autocvars.qh
index 22ab63181,11cf993df..92ff35897
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -479,7 -971,10 +479,9 @@@ float autocvar_g_spawn_furthest
  float autocvar_g_spawn_useallspawns;
  float autocvar_g_spawnpoints_auto_move_out_of_solid;
  #define autocvar_g_spawnshieldtime cvar("g_spawnshieldtime")
 -#define autocvar_g_start_weapon_laser cvar("g_start_weapon_laser")
  float autocvar_g_tdm_team_spawns;
+ float autocvar_g_tdm_point_limit;
+ float autocvar_g_tdm_point_leadlimit;
  float autocvar_g_tdm_teams;
  float autocvar_g_tdm_teams_override;
  float autocvar_g_teamdamage_resetspeed;