From: Mario Date: Sun, 30 Sep 2018 19:07:43 +0000 (+1000) Subject: Limit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset) X-Git-Tag: xonotic-v0.8.5~1803 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d1bdbcf9721e04c019f3d5d54104e09b333ccf0;p=xonotic%2Fxonotic-data.pk3dir.git Limit warmups to 3 minutes by default (restored to full timelimit in XPM ruleset) --- diff --git a/ruleset-XPM.cfg b/ruleset-XPM.cfg index eb682aa55..67589147b 100644 --- a/ruleset-XPM.cfg +++ b/ruleset-XPM.cfg @@ -14,6 +14,7 @@ set teamplay_mode 2 // friendly fire and self damage set sv_vote_nospectators 1 set g_chat_nospectators 2 set g_warmup 1 +set g_warmup_limit 0 set g_balance_teams 0 set g_spawnshieldtime 0 set g_spawn_furthest 1 diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 2b1cdbc65..61f8ccd4b 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -25,7 +25,7 @@ set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectat // tournament mod set g_warmup 0 "split the game into a warmup- and match-stage" -set g_warmup_limit 0 "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_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" set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end"