Merge branch 'master' into bones_was_here/q3compat

diff --cc qcsrc/common/physics/player.qc
Simple merge

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

diff --cc qcsrc/server/compat/quake.qc
index 0d1e8a6e909e53921180976ed3e5858113c1a70a,23ae923b0a61c1213f2d4289ebfdbe8dc47e58e1..8c227f9bebaf003e89a2014b9f74ef439e8bcad3
--- 1/qcsrc/server/compat/quake.qc
--- 2/qcsrc/server/compat/quake.qc
+++ b/qcsrc/server/compat/quake.qc
@@@ -2,16 -2,12 +2,15 @@@
  
  #include <common/weapons/_all.qh>
  #include <common/stats.qh>
- #include <server/miscfunctions.qh>
  #include <common/weapons/_all.qh>
  
 -//***********************
 -//QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 -//***********************
 -SPAWNFUNC_WEAPON(weapon_nailgun, WEP_ELECTRO)
 +/***********************
 + * QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons
 + ***********************
 + weapon_nailgun handled in quake3.qc
 + item_armor1 handled in items.qc
 +*/
 +
  SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR)
  SPAWNFUNC_WEAPON(weapon_supershotgun, WEP_MACHINEGUN)
  

diff --cc qcsrc/server/compat/quake3.qc
Simple merge

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

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

diff --cc qcsrc/server/weapons/spawning.qc
Simple merge

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