Merge branch 'post-0.8.2' into 'develop'

Remove legacy 0.8.1 workarounds

See merge request xonotic/xonotic-data.pk3dir!457

diff --combined qcsrc/common/weapons/all.qh
index 2725b8f441804949f5df2b22091cda583f43c679,a46b0f1c9346160224620a2fa98fb7d7f57f0e99..6ce163fa77a437e9211ed3f6fc9a6c9c2aa24496
--- 1/qcsrc/common/weapons/all.qh
--- 2/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@@ -82,8 -82,8 +82,8 @@@ GENERIC_COMMAND(dumpweapons, "Dump all 
          default:
          case CMD_REQUEST_USAGE:
          {
 -            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [filename]");
 -            LOG_HELP("  Where 'filename' is the file to write (default is weapons_dump.cfg),");
 +            LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [<filename>]");
 +            LOG_HELP("  Where <filename> is the file to write (default is weapons_dump.cfg),");
              LOG_HELP("  if supplied with '-' output to console as well as default,");
              LOG_HELP("  if left blank, it will only write to default.");
              return;
@@@ -305,14 -305,11 +305,11 @@@ WepSet WEPSET_SUPERWEAPONS
  
  #include "all.inc"
  
- // TODO: remove after 0.8.2. Retains impulse number compatibility because 0.8.1 clients don't reload the weapons.cfg
- #define WEP_HARDCODED_IMPULSES 20
- 
  // TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
  #define WEP_IMPULSE_BEGIN 230
  #define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (REGISTRY_COUNT(Weapons) - 1) - 1, 253)
  
- REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
+ REGISTRY_SORT(Weapons, 1)
  REGISTRY_CHECK(Weapons)
  
  STATIC_INIT(register_weapons_done)
@@@ -347,7 -344,7 +344,7 @@@
  vector weaponentity_glowmod(Weapon wep, entity actor, int c, entity wepent)
  {
      vector g;
 -    if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true) * 2;
 +    if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true);
      return g;
  }
  

diff --combined xonotic-client.cfg
index 653015363c1c7dce069df8eac6ac3fe9ff76ca13,89ebe3e2bd05c91983374199850e81d127106a99..ecb7e023eaa00830a275362edf8f17cd79b691e3
--- 1/xonotic-client.cfg
--- 2/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@@ -32,6 -32,7 +32,6 @@@ mod_q3bsp_lightmapmergepower 
  // player defaults
  _cl_color "112.211" // same effect as 112, but menuqc can detect this as the default and not intentionally set
  _cl_name ""
 -seta _cl_gender 0 "storage cvar for current player gender (0 = undisclosed, 1 = male, 2 = female)"
  _cl_playerskin 0
  
  seta cl_reticle 1 "enable zoom reticles"
@@@ -247,17 -248,6 +247,17 @@@ alias g_waypointeditor_remove        "w
  alias g_waypointeditor_relinkall     "wpeditor relinkall"
  alias g_waypointeditor_saveall       "wpeditor saveall"
  alias g_waypointeditor_unreachable   "wpeditor unreachable"
 +alias g_waypointeditor_help          "wpeditor"
 +alias g_waypointeditor_menu          "wpeditor_menu"
 +alias g_waypointeditor_spawn_x       "wpeditor spawn crosshair"
 +alias g_waypointeditor_spawn_jump    "wpeditor spawn jump"
 +alias g_waypointeditor_spawn_crouch  "wpeditor spawn crouch"
 +alias g_waypointeditor_spawn_support "wpeditor spawn support"
 +alias g_waypointeditor_hardwire      "wpeditor hardwire"
 +alias g_waypointeditor_hardwire_x    "wpeditor hardwire crosshair"
 +alias g_waypointeditor_lock          "wpeditor lock"
 +alias g_waypointeditor_symorigin     "wpeditor symorigin $*"
 +alias g_waypointeditor_symaxis       "wpeditor symaxis $*"
  
  alias navwaypoint_relink        g_waypointeditor_spawn
  alias navwaypoint_remove        g_waypointeditor_remove
@@@ -379,8 -369,6 +379,6 @@@ alias weapon_group_7 "impulse 7
  alias weapon_group_8 "impulse 8"
  alias weapon_group_9 "impulse 9"
  alias weapon_group_0 "impulse 14" // cycles the superweapons
- // TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
- exec weapons.cfg
  
  cl_curl_enabled 1
  cl_curl_maxdownloads 3
@@@ -699,10 -687,10 +697,10 @@@ set camera_look_attenuation     8       "Attenua
  set camera_forward_follows    1       "0: Move the camera forwards without changing altitude. 1: Move towards what you are looking"
  
  // "Gentle mode": show no blood
 -seta cl_gentle 0              "client side gentle mode, master switch for removing both gibs and messages"
 -seta cl_gentle_gibs 0         "client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
 -seta cl_gentle_messages 0     "client side gentle mode (only replaces frag messages/centerprints)"
 -seta cl_gentle_damage 0       "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead"
 +seta cl_gentle 0                      "client side gentle mode, master switch"
 +seta cl_gentle_gibs 0         "client side gentle mode for gibs (cl_nogibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
 +seta cl_gentle_messages 0     "client side gentle mode for frag messages/centerprints"
 +seta cl_gentle_damage 0               "client side gentle mode for damage flash (hud_damage); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead"
  
  set cl_jetpack_attenuation 2 "jetpack sound attenuation"
  
@@@ -777,9 -765,6 +775,9 @@@ r_useportalculling 
  set cl_lerpanim_maxdelta_framegroups 0.05 // must be faster than fastest weapon refire
  set cl_lerpanim_maxdelta_server 0.1 // must be slower than slowest server controlled anim (e.g. animinfo stuff)
  
 +// DP lerps player models by default, we should also lerp the hud_shownames sprites
 +r_lerpsprites 1
 +
  // autodemo deleting
  seta cl_autodemo_delete_keeprecords 0 "when 1, records with a newly made race/cts demo are kept even if cl_autodemo_delete is used to delete demos"