Merge remote branch 'origin/master' into samual/flyingspectators

Conflicts:
	qcsrc/server/defs.qh

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/cl_client.qc
index 66d2b05ab74541978ab8bbc0cc83209f8e511847,0cf0d9ea512224843f2de8f7625cfb64cef2c84e..60dbeda7e15df958ac656f4f6aedaef73b7dbb72
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2527,10 -2503,8 +2503,9 @@@ void checkSpectatorBlock() 
  
  void ObserverThink()
  {
 +      float prefered_movetype;
        if (self.flags & FL_JUMPRELEASED) {
                if (self.BUTTON_JUMP && !self.version_mismatch) {
-                       self.welcomemessage_time = 0;
                        self.flags &~= FL_JUMPRELEASED;
                        self.flags |= FL_SPAWNING;
                } else if(self.BUTTON_ATCK && !self.version_mismatch) {

diff --cc qcsrc/server/defs.qh
index 4dda284374fe27e2ba0b17ae306cc0c6b5d61e0a,9e6a73b5e3642fe9e9ae952a9b6a318120e32ad7..6ef2bfcd0cc925397616ff34b8f8dc528896d1bd
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -312,9 -309,6 +309,8 @@@ float default_weapon_alpha
  .float() customizeentityforclient;
  .float cvar_cl_handicap;
  .float cvar_cl_playerdetailreduction;
- .float cvar_scr_centertime;
 +.float cvar_cl_clippedspectating;
 +
  .string cvar_g_xonoticversion;
  .string cvar_cl_weaponpriority;
  .string cvar_cl_weaponpriorities[10];

diff --cc qcsrc/server/miscfunctions.qc
index 9a952ab54d2ef484a374e42e9693fe6f4321e230,9b0324755a41669bc1b6d0a750a306d45d481bba..1ca1768965b0fe3dcc6d9ca565ddb6a80628d84a
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -579,10 -584,8 +584,9 @@@ void GetCvars(float f
        MUTATOR_CALLHOOK(GetCvars);
        GetCvars_handleFloat(s, f, autoswitch, "cl_autoswitch");
        GetCvars_handleFloat(s, f, cvar_cl_playerdetailreduction, "cl_playerdetailreduction");
-       GetCvars_handleFloat(s, f, cvar_scr_centertime, "scr_centertime");
        GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
        GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");
 +      GetCvars_handleFloat(s, f, cvar_cl_clippedspectating, "cl_clippedspectating");
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);