Merge branch 'master' into divVerent/csqcmodel

diff --combined defaultXonotic.cfg
index 97ac22b0f0ba5883c4790b78076603a3646e235b,378541e03974c8686855618870b5a57e203db6d4..501b9b996c48b6ec3facdeba9ec19d5b22b9f510
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1291,6 -1291,9 +1291,9 @@@ alias "g_waypointsprite_toggle" "toggl
  // key for that?
  seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
  
+ seta g_waypointsprites_turrets 1 "disable turret waypoints"
+ seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites"
+ 
  // command extension
  alias qc_cmd  "sv_cmd $*" // menu QC will override this to menu_cmd
  alias adminmsg        "sv_cmd adminmsg $*"
@@@ -1882,7 -1885,6 +1885,7 @@@ set developer_shtest 0 "experimental sp
  set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigation code"
  set g_debug_bot_commands 0 "print scripted bot commands before executing"
  set g_debug_defaultsounds 0 "always use default sounds"
 +set sv_use_csqc_players 0 "set to 1 to network players to CSQC"
  
  // debug cvars for keyhunt attaching
  set _angles "0 0 0"

diff --combined qcsrc/client/autocvars.qh
index 92b391fd1d9886b88a9350543be35f6e4089c108,e18433e9666465ef36702c7ba10637eb4e3d1a6a..8f77805d1023d640fbd33dfd219eb73d46894b71
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -151,6 -151,9 +151,9 @@@ float autocvar_g_waypointsprite_normdis
  float autocvar_g_waypointsprite_scale;
  float autocvar_g_waypointsprite_spam;
  float autocvar_g_waypointsprite_timealphaexponent;
+ float autocvar_g_waypointsprites_turrets;
+ float autocvar_g_waypointsprites_turrets_maxdist;
+ 
  float autocvar_hud_colorflash_alpha;
  float autocvar_hud_configure_checkcollisions;
  float autocvar_hud_configure_grid;
@@@ -370,6 -373,3 +373,6 @@@ var float autocvar_cl_eventchase_distan
  var float autocvar_cl_eventchase_speed = 1.3;
  float autocvar_cl_lerpexcess;
  string autocvar__togglezoom;
 +float autocvar_cl_playerdetailreduction;
 +float autocvar_cl_loddistance1 = 1024;
 +float autocvar_cl_loddistance2 = 4096;