From: Samual <samual@xonotic.org>
Date: Sat, 14 May 2011 20:25:07 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9217f0a954cc581e50461a7603b1f0aea718685e;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/defs.qh
---

9217f0a954cc581e50461a7603b1f0aea718685e
diff --cc qcsrc/server/defs.qh
index 4317b0cac,19f0c24a5..92872dc65
--- a/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 d599c259c,0602ed9d8..00ed1e47e
--- a/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);