Merge branch 'master' into mand1nga/bot-debug

diff --combined qcsrc/server/autocvars.qh
index b7e053403f19f6ce4d1d226a42a08e8056f58a5a,85767d3039fc22bcac34b1fcd155815700f8c493..467838ca2c6afda131d50812077fb803ebcf559b
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -54,8 -54,6 +54,8 @@@ float autocvar_bot_sound_monopoly
  #define autocvar_bot_suffix cvar_string("bot_suffix")
  float autocvar_bot_usemodelnames;
  float autocvar_bot_vs_human;
 +float autocvar_bot_debug_tracewalk;
 +float autocvar_bot_debug_goalstack;
  float autocvar_captureleadlimit_override;
  #define autocvar_capturelimit_override cvar("capturelimit_override")
  float autocvar_deathmatch_force_teamplay;
@@@ -95,6 -93,7 +95,7 @@@ float autocvar_g_balance_sniperrifle_pr
  float autocvar_g_balance_sniperrifle_primary_headshotaddeddamage;
  float autocvar_g_balance_sniperrifle_primary_lifetime;
  float autocvar_g_balance_sniperrifle_primary_refire;
+ float autocvar_g_balance_sniperrifle_primary_shots;
  float autocvar_g_balance_sniperrifle_primary_speed;
  float autocvar_g_balance_sniperrifle_primary_spread;
  float autocvar_g_balance_sniperrifle_primary_tracer;
@@@ -110,6 -109,7 +111,7 @@@ float autocvar_g_balance_sniperrifle_se
  float autocvar_g_balance_sniperrifle_secondary_lifetime;
  float autocvar_g_balance_sniperrifle_secondary_reload;
  float autocvar_g_balance_sniperrifle_secondary_refire;
+ float autocvar_g_balance_sniperrifle_secondary_shots;
  float autocvar_g_balance_sniperrifle_secondary_speed;
  float autocvar_g_balance_sniperrifle_secondary_spread;
  float autocvar_g_balance_sniperrifle_secondary_tracer;