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

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

diff --cc defaultXonotic.cfg
index 84157c2bf78089c1f3f9ac64adfc08f2ff012029,0a959f207e70034da2d3b5d899caf8df8528d36b..b340e5ddecb9b2c01c71d120c2dedcd02b48b9e6
--- 1/defaultXonotic.cfg
--- 2/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/client/Main.qc
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
Simple merge

diff --cc qcsrc/client/scoreboard.qc
Simple merge

diff --cc qcsrc/common/constants.qh
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

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

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

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

diff --cc qcsrc/server/defs.qh
index ecca4ac431250e1aba349da70b3d5a02dc7ba988,9295547c530f03e929d6310ffaa267628e43f955..45394eb7925db2bf34fd5e10818131e5646af2dc
--- 1/qcsrc/server/defs.qh
--- 2/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);
  

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

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

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