From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 3 Nov 2010 20:42:30 +0000 (+0100)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'
X-Git-Tag: xonotic-v0.1.0preview~202
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

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

4fc59bbd7e2d4f25ba21952ed50ae754295a7faa
diff --cc defaultXonotic.cfg
index 84157c2bf,0a959f207..b340e5dde
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1998,6 -1993,5 +2000,9 @@@ r_font_hinting 
  r_font_disable_freetype 0
  r_font_size_snapping 2
  
 +// database management
 +set sv_db_saveasdump 0 "write server.db in dump format (loads slower, easier to read/parse)"
 +set cl_db_saveasdump 0 "write client.db in dump format (loads slower, easier to read/parse)"
++
+ // uid2name
+ seta cl_allow_uid2name -1 "-1 = ask if the player wants to disable/enable this feature, 0 = disable, 1 = enable uid2name (allows showing your name in race rankings for instance)"
diff --cc qcsrc/server/defs.qh
index ecca4ac43,9295547c5..45394eb79
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -327,8 -329,9 +327,11 @@@ float sv_loddistance2
  .float cvar_cl_gunalign;
  .float cvar_cl_noantilag;
  
 +.string weaponorder_byimpulse;
 +
+ .float cvar_cl_allow_uid2name;
+ .string stored_netname;
+ 
  void Announce(string snd);
  void AnnounceTo(entity e, string snd);