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

diff --combined defaultXonotic.cfg
index 5f925430e13cee239f82e12b52f9c0d2f63709ea,378541e03974c8686855618870b5a57e203db6d4..8d5cecd54149ee384e085b0edcd762c307273f95
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -69,11 -69,6 +69,11 @@@ alias rec "record demos/$1
  alias ply "playdemo $1"
  alias tdem "timedemo $1"
  
 +// for backwards compatibility
 +alias savedb "sv_cmd database save \"$1\""
 +alias dumpdb "sv_cmd database dump \"$1\""
 +alias loaddb "sv_cmd database load \"$1\""
 +
  alias dropweapon "impulse 17"
  alias +show_info +button7
  alias -show_info -button7
@@@ -1296,6 -1291,9 +1296,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 $*"

diff --combined qcsrc/client/progs.src
index 2a8e9e93b63a79a7cd42dc709fe75178a718d630,a4d8b70b1c4e3cf9c83e0ac98a27e1049bf495ca..e8ba3990e04eabb0e461edca098cd99a4a7a6c0f
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -1,12 -1,10 +1,10 @@@
  ../../csprogs.dat
  
+ ../common/util-pre.qh
  sys-pre.qh
  ../dpdefs/csprogsdefs.qc
  sys-post.qh
  
- pre.qh
- 
- ../common/util-pre.qh
  Defs.qc
  ../dpdefs/keycodes.qc
  ../common/constants.qh
@@@ -79,7 -77,6 +77,7 @@@ movetypes.q
  prandom.qc
  bgmscript.qc
  noise.qc
 +gamecommand.qc
  
  ../common/util.qc
  ../common/gamecommand.qc

diff --combined qcsrc/server/progs.src
index aac9072c52e2bfc3df56d8d36a1542ec9e1e4f35,64e6e66741b1ab3936f41180d6ed78bc4a20d67c..a07454ffa3566066f5778023661a1959267c0683
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -1,12 -1,11 +1,11 @@@
  ../../progs.dat // output filename
  
+ ../common/util-pre.qh
  sys-pre.qh
  ../dpdefs/progsdefs.qc
  ../dpdefs/dpextensions.qc
  sys-post.qh
  
- ../common/util-pre.qh
- 
  ../warpzonelib/anglestransform.qh
  ../warpzonelib/mathlib.qh
  ../warpzonelib/common.qh
@@@ -145,8 -144,6 +144,8 @@@ campaign.q
  ../common/gamecommand.qc
  gamecommand.qc
  
 +radarmap.qc
 +
  assault.qc
  
  ipban.qc