Merge remote branch 'origin/master' into samual/balance

diff --combined qcsrc/client/autocvars.qh
index c57f4709df591a32ce2fc75a2850c05287f94944,13db0b1932c9277a87aa3995f0f153e2050cec17..6b619e5bc3e9023e6b38e4e019681c59ced18298
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -19,8 -19,6 +19,8 @@@ float autocvar_camera_speed_roll
  float autocvar_chase_active;
  float autocvar_cl_allow_uid2name;
  string autocvar_cl_announcer;
 +float autocvar_cl_announcer_antispam;
 +float autocvar_cl_announcer_maptime;
  float autocvar_cl_autodemo_delete;
  float autocvar_cl_autodemo_delete_keeprecords;
  float autocvar_cl_casings;
@@@ -63,6 -61,7 +63,6 @@@ var float autocvar_cl_reticle = 1
  float autocvar_cl_reticle_item_nex;
  float autocvar_cl_reticle_item_normal;
  float autocvar_cl_reticle_stretch;
 -float autocvar_cl_sound_maptime_warning;
  float autocvar_cl_stripcolorcodes;
  var float autocvar_cl_vehicle_spiderbot_cross_alpha = 0.6;
  var float autocvar_cl_vehicle_spiderbot_cross_size = 1;
@@@ -258,7 -257,7 +258,7 @@@ float autocvar_hud_panel_notify_fontsiz
  float autocvar_hud_panel_notify_print;
  float autocvar_hud_panel_notify_time;
  float autocvar_hud_panel_physics;
- float autocvar_hud_panel_physics_acceleration_progressbar_mode;
+ float autocvar_hud_panel_physics_acceleration_mode;
  float autocvar_hud_panel_physics_acceleration_max;
  float autocvar_hud_panel_physics_progressbar;
  float autocvar_hud_panel_physics_acceleration_vertical;