Merge branch 'master' into Mario/showspecs

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/client/hud.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
index a61a2a53e166a5f9027e46d56e0cce4f13a5580b,d803602ad6ccd6c229e5b61ffa20f4dfc976b6ae..b7ca56b84aaaf1a88d7606264cc4fc30c8b3a477
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1773,11 -1766,8 +1773,11 @@@ float SpectateUpdate() 
        if (self == self.enemy)
                return 0;
  
-       if not(IS_PLAYER(self.enemy))
+       if (!IS_PLAYER(self.enemy))
 +      {
 +              self.enemy = world;
                return 0;
 +      }
  
        SpectateCopy(self.enemy);