Merge branch 'master' into Mario/respawn_delays

diff --cc defaultXonotic.cfg
index d0817109e9daebd4d61ef180b5bb4b73dd61f3ab,d967d53d555dee2e8dd5f98b46f4c98f8ff1d9d1..5f618ceb7260d02ce6fcde04ba0b2922d32d1437
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -456,26 -463,8 +463,9 @@@ set g_grappling_hook 0 "let players spa
  set g_spawn_alloweffects 1 "allow clients to enable spawn point and event effects such as particles and sounds, see cl_spawn_ cvars for more info"
  set g_spawn_furthest 1 "this amount of the spawns shall be far away from any players"
  set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
- set g_spawn_near_teammate 0 "if set, players prefer spawns near a team mate"
- set g_spawn_near_teammate_distance 640 "max distance to consider a spawn to be near a team mate"
  // respawn delay
  set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
 +set g_respawn_delay_max 5 "number of seconds you can wait before you're forced to respawn (only effective with g_forced_respawn 1)"
  set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
  
  // overtime

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

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

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

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