Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index 1e2e56e53c0c7434a237ca93282ede75d5fcc139,f269a424ac37b7dccae8220b7a0191f5793f78bd..722f591389a8b375527825fa0bb8644e1519e7ae
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -293,12 -330,11 +293,12 @@@ set teamplay_lockonrestart 0 "it set t
  set g_maxplayers 0    "maximum number of players allowed to play at the same time, set to 0 to allow all players to join the game"
  set g_maxplayers_spectator_blocktime 5        "if the players voted for the \"nospectators\" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked"
  
 -//tournament mod
 +// 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_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"
  
  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)"

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