From: Samual <samual@xonotic.org>
Date: Thu, 22 Dec 2011 23:08:06 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~87
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcb30bf31a58942eb89829a72b1e76661de7920c;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	defaultXonotic.cfg
---

bcb30bf31a58942eb89829a72b1e76661de7920c
diff --cc defaultXonotic.cfg
index 1e2e56e53,f269a424a..722f59138
--- a/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)"