Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Sat, 14 May 2011 20:25:07 +0000 (16:25 -0400)
committerSamual <samual@xonotic.org>
Sat, 14 May 2011 20:25:07 +0000 (16:25 -0400)
Conflicts:
qcsrc/server/defs.qh

1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/t_teleporters.qc

Simple merge
Simple merge
@@@ -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];
@@@ -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);
Simple merge