Merge remote-tracking branch 'origin/master' into morosophos/server-current4

diff --cc _hud_common.cfg
Simple merge

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

diff --cc qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc
Simple merge

diff --cc xonotic-server.cfg
index bd1869e24a82f374e4aa0250b1bfab5a1b096dfb,94532425fecf63013af480dd795a2ada350a446f..f4181e79de07014a8d829165c9202b81df8b0a0c
--- 1/xonotic-server.cfg
--- 2/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@@ -600,4 -599,5 +600,6 @@@ sv_disablenotify 
  
  set sv_quickmenu_file "" "filename of a custom server's quickmenu that will be selectable from the default client's quickmenu. This file must be sent in a pk3 archive and should have an unique name (e.g. quickmenu-servername.txt) to prevent overriding existing quickmenus"
  
 +set sv_checkpoint_house_url "http://127.0.0.1:10876/new-record"
+ // Avoid perf problems near '0 0 0'; `set` without a description is because only current DP has this engine cvar
+ set sv_areagrid_link_SOLID_NOT 0