Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

diff --combined qcsrc/server/autocvars.qh
index f048862ab85c4160c30f7b89e1299b83b4a95884,4d8083fe779f7a1865af178f492fcf110aaf0bcc..3263d2ed1ea5fb4c41f61847ed90d2af271b6369
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -646,6 -646,7 +646,7 @@@ float autocvar_g_balance_shotgun_second
  float autocvar_g_balance_shotgun_secondary_melee_range;
  float autocvar_g_balance_shotgun_secondary_melee_swing;
  float autocvar_g_balance_shotgun_secondary_melee_time;
+ float autocvar_g_balance_shotgun_secondary_melee_no_doubleslap;
  float autocvar_g_balance_shotgun_secondary_refire;
  float autocvar_g_balance_shotgun_reload_ammo;
  float autocvar_g_balance_shotgun_reload_time;
@@@ -1237,4 -1238,3 +1238,4 @@@ float autocvar_waypoint_benchmark
  float autocvar_welcome_message_time;
  float autocvar_sv_gameplayfix_gravityunaffectedbyticrate;
  float autocvar_g_trueaim_minrange;
 +float autocvar_sv_shownames_cull_distance;