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

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/strafehud.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
Simple merge

diff --cc qcsrc/common/mapobjects/func/door.qc
index ac1e0bee49bb6aaf07099ea512c5aadf487aae2e,9751719cea2cd2fadbc22d4eeecb2b456ce980f8..9afe3aaded7a6bd2794f53010fc8a785c7cc653f
--- 1/qcsrc/common/mapobjects/func/door.qc
--- 2/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@@ -415,7 -415,9 +415,9 @@@ LinkDoor
  
  entity LinkDoors_nextent(entity cur, entity near, entity pass)
  {
-       while((cur = find(cur, classname, pass.classname)) && ((cur.spawnflags & DOOR_DONT_LINK && !Q3COMPAT_COMMON) || cur.enemy))
 -      while((cur = find(cur, classname, pass.classname)) 
++      while((cur = find(cur, classname, pass.classname))
+       && (((cur.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON) 
+       || cur.enemy))
        {
        }
        return cur;
@@@ -453,7 -455,8 +455,8 @@@ void LinkDoors(entity this
                return;         // already linked by another door
  
        // Q3 door linking is done for teamed doors only and is not affected by spawnflags or bmodel proximity
-       if ((this.spawnflags & DOOR_DONT_LINK && !Q3COMPAT_COMMON) || (Q3COMPAT_COMMON && !this.team))
 -      if (((this.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON) 
++      if (((this.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON)
+       || (Q3COMPAT_COMMON && !this.team))
        {
                this.owner = this.enemy = this;
  

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

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

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

diff --cc xonotic-server.cfg
Simple merge