Merge branch 'master' into Mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
Simple merge

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_physics.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/progs.src
index 2d52f4235cd7555f2b7d8dbbe5c002bcca7c9888,df5623f0535a42bd3c5b1a4b04baa0b516aa57b8..acf17496027a5c419e6a4e7bc15e1da33b646730
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -202,10 -199,10 +204,12 @@@ vehicles/vehicles.q
  
  scores.qc
  
+ spawnpoints.qc
+ 
  portals.qc
  
 +generator.qc
 +
  target_spawn.qc
  func_breakable.qc
  target_music.qc

diff --cc qcsrc/server/t_items.qc
Simple merge