Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

diff --combined defaultXonotic.cfg
index d31db259a7a6baae0714272624cf650433e58187,4315cef024ed6b00216fae39e353df893af16518..fb50f791c3118025a8d0235f394d29771a07f68b
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1251,10 -1251,7 +1251,10 @@@ alias sv_fbskin_off "sv_defaultcharacte
  seta sv_servermodelsonly 1
  
  cl_curl_enabled 1
 -cl_curl_maxspeed 400
 +cl_curl_maxspeed 500
 +cl_curl_useragent 1
 +cl_curl_useragent_append "$g_xonoticversion"
 +
  sv_curl_defaulturl "http://www.xonotic.org/contentdownload/getmap.php?file="
  set sv_curl_serverpackages_auto 1 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
  
@@@ -1923,7 -1920,8 +1923,8 @@@ set waypoint_benchmark 0 "quit after wa
  set g_debug_bot_commands 0 "print scripted bot commands before executing"
  set g_debug_defaultsounds 0 "always use default sounds"
  set sv_use_csqc_players 1 "set to 0 to disable CSQC players for better Xonotic 0.5 compat"
- set cl_forceplayermodels 0 "set to 1 to make everyone look like yourself (requires server to have sv_use_csqc_players 1)"
+ set cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0)"
+ set cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_use_csqc_players 1 and sv_defaultcharacter 0, and is ignored in teamplay)"
  set cl_precacheplayermodels 0 "TODO please check if this needs to be 1 or if precaching a model the server already requested is fast enough to do it at runtime"
  
  // debug cvars for keyhunt attaching