X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-server.cfg;fp=xonotic-server.cfg;h=04a6da7048241e2484a9ba262e1f85ae2c858f51;hb=c88915306c11c228f92e605482ff612b59469910;hp=cf7544a08194a07f7965bebe78ce5adaaebe42e6;hpb=7e08fc9d61c6f434a3ad35775e7f4b94464d5470;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index cf7544a08..04a6da704 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -30,7 +30,7 @@ set g_maxplayers 0 "maximum number of players allowed to play at the same time,
 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
-set g_warmup 0 "split the game into a warmup- and match-stage, -1 means stay in warmup until enough (set by map, lower bound of 2 or 2 per team) players join, then g_warmup_limit and readiness apply"
+set g_warmup 0 "splits the game into warmup and match stages, 1 means the match starts when g_warmup_majority_factor of players are ready OR g_warmup_limit is hit, >1 also requires at least g_warmup players (including bots) to join, -1 means that minimum player requrement is set by the map (lower bound of 2 or 2 per team)"
 set g_warmup_limit 180 "limit warmup-stage to this time (in seconds); if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage"
 set g_warmup_allow_timeout 0 "allow calling timeouts in the warmup-stage (if sv_timeout is set to 1)"
 set g_warmup_allguns 1 "provide more weapons on start while in warmup: 0 = normal start weapons, 1 = all guns available on the map, 2 = all normal weapons"