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
Simple merge

diff --cc qcsrc/server/defs.qh
index 4317b0cacc5c27f0f40a4f091ac0d8db2896ea1d,19f0c24a5981c6d2c4001623c99188b17fc5abf7..92872dc659ff27e09ba2b020387ba0e75ac51335
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -312,8 -313,6 +313,9 @@@ float default_weapon_alpha
  .float cvar_cl_handicap;
  .float cvar_cl_playerdetailreduction;
  .float cvar_scr_centertime;
 +.float cvar_cl_shownames;
 +.float cvar_cl_noclipspectating;
++
  .string cvar_g_xonoticversion;
  .string cvar_cl_weaponpriority;
  .string cvar_cl_weaponpriorities[10];

diff --cc qcsrc/server/miscfunctions.qc
index d599c259cd97b0688900d7fbaa6c57ad567ab708,0602ed9d87b3f436234bb0e681333d6a4f17491b..00ed1e47ea591de7215445180c59e9c0505567fe
--- 1/qcsrc/server/miscfunctions.qc
--- 2/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -585,10 -580,8 +580,9 @@@ void GetCvars(float f
        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_handleFloat(s, f, cvar_cl_shownames, "cl_shownames");
        GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
        GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");
 +      GetCvars_handleFloat(s, f, cvar_cl_noclipspectating, "cl_noclipspectating");
        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);

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