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

diff --combined defaultXonotic.cfg
index d60ca8c3936fdd6479b0dc3f1242f6b2065af03d,f269a424ac37b7dccae8220b7a0191f5793f78bd..d1b82b67560fd6d5b7a9407f41aa494e4c602b04
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -332,9 -332,9 +332,9 @@@ set g_maxplayers_spectator_blocktime 5     
  
  //tournament mod
  set g_warmup 0        "split the game into a warmup- and match-stage when set to 1"
- set g_warmup_limit 60 "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)"
+ set g_warmup_limit 0  "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)"
  set g_warmup_allow_timeout 0  "if set to 1 timeouts can also be called in the warmup-stage, when sv_timeout is set to 1"
- set g_warmup_allguns 0        "if set players start with all guns in warmup mode"
+ set g_warmup_allguns 1        "if set players start with all guns in warmup mode"
  
  set g_chat_nospectators 0     "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage"
  set sv_vote_nospectators 0    "if set only players can call a vote (thus spectators and observers can't call a vote)"
@@@ -1885,8 -1885,8 +1885,8 @@@ set g_triggerimpulse_directional_multip
  set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplier"
  set the_goggles "they do nothing" "but the googles, they do"
  
- seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
- seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
+ set g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"
+ set g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
  
  set sv_weaponstats_file "" "when set to a file name, per-weapon stats get written to that file"
  
@@@ -1949,9 -1949,6 +1949,9 @@@ sv_gameplayfix_consistentplayerprethin
  // support Q1BSP maps
  mod_q1bsp_polygoncollisions 1
  
 +// match q3map2
 +mod_obj_orientation 0
 +
  // improve some minor details
  sv_gameplayfix_gravityunaffectedbyticrate 1
  sv_gameplayfix_nogravityonground 1