Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

diff --combined server/server.cfg
index 8f495976b89c260c4f41ac7691693468081d6060,9f64194955a845527e1768c6d2f83aba7122252b..2f7a55869535e1f754519e7c91df0d12e2ffa428
--- 1/server/server.cfg
--- 2/server/server.cfg
+++ b/server/server.cfg
@@@ -57,7 -57,7 +57,7 @@@
  //rcon_restricted_password "" // put here the password for a "restricted" rcon user (see below)
  
  //bot_number 0        // number of bots to add
 -//skill 1     // the bots skill level
 +//skill 4     // the bots skill level
  //minplayers 0        // add bots if less then that number of players playing. MAKE SURE ITS LESS THEN maxplayers or people will get blocked by bots!
  //g_maxplayers 0 // above this player count, only allow spectators
  //bot_prefix [BOT]    // prepend this to all botnames
@@@ -84,6 -84,57 +84,57 @@@
  
  
  
+ 
+ /////////////////////////////////////////////////////////////////////
+ // Settings you MIGHT want to change for PRIVACY reasons.
+ //
+ // The settings here may impact your or your players' privacy and serve to
+ // optimize the game for further releases.
+ //
+ // Change them, or comment them out to turn them off.
+ 
+ // This line sends the following data to our servers:
+ // - Date and time
+ // - Your server IP address
+ // - Your server ID hash, which is a fingerprint of the public key of your
+ //   server and does not impact security of your private key (use "crypto_keys"
+ //   on the console to show it)
+ // - Your server name ("hostname")
+ // - Current game type
+ // - Current map
+ // - Balance settings you have modified from defaults (only those that make
+ //   your server "impure")
+ // - For each weapon pairing (A, B), separately for player-player, player-bot,
+ //   bot-player, bot-bot pairings:
+ //   - Number of hits of players/bots holding A against players/bots holding B
+ //   - Number of frags of players/bots holding A against players/bots holding B
+ //   - Total damage of players/bots holding A against players/bots holding B
+ //
+ // We use this data to:
+ // - Optimize the game balance for future releases
+ // - Identify problems in the bot AI and improving it
+ // - Find settings that make servers "impure" that should not, so we can
+ //   whitelist them in future releases
+ //
+ // We will or might publish:
+ // - Global weapon pairing statistics for players vs players, or bots vs bots,
+ //   or any vs any, on a selection of servers
+ // - Per-gametype and per-map weapon pairing statistics players vs players, or
+ //   bots vs bots, or any vs any, on a selection of servers
+ // - Lists of commonly changed cvars, together with counts on how often they
+ //   are modified
+ //
+ // No information about the players on the server is sent, so as a server admin
+ // you need no permission of your players for this.
+ //
+ // No information about your server will be published - all published data sets
+ // will include data from multiple servers.
+ //   
+ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
+ 
+ 
+ 
+ 
  /////////////////////////////////////////////////////////////////////
  // Some more advanced settings.  You probably are not interested in changing them at all.
  
@@@ -114,9 -165,11 +165,11 @@@
  /////////////////////////////////////////////////////////////////////
  // "Obvious" mutators that are allowed on a "pure" server
  //g_minstagib 0       // set to 1 for MinstaGib
 -g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
 +//g_weapon_stay 0 // set to 1, 2 or 3 for different weapon-stay modes (1 = traditional, 2 = no ammo but allow throwing, 3 = ghost weapon stay)
  
  
+ 
+ 
  /////////////////////////////////////////////////////////////////////
  // WARNING: anything below this line makes your server "impure"!