Merge branch 'master' into Mario/despawn_effects

diff --cc qcsrc/server/autocvars.qh
index 22ab63181bc12d490834b02a9a8f49912a9d8953,11cf993df22915f8a8892d81bb192b6186e34144..92ff3589796642f5120cbf52b4b3ec24585b5ced
--- 1/qcsrc/server/autocvars.qh
--- 2/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;

diff --cc qcsrc/server/teamplay.qc
Simple merge