Merge branch 'drjaska/g_warmup_allguns' into 'master'

[xonotic/xonotic-data.pk3dir.git] / xonotic-server.cfg

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index e638577222b1cc279385114895fd6e4e8777e022..461c2e524f05a59305835c9ff572469e00221add 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -281,6 +281,9 @@ set g_teamdamage_resetspeed 20      "for teamplay_mode 4: how fast player's team
 
 set g_balance_teams 1 "automatically balance out players entering instead of asking them for their preferred team"
 set g_balance_teams_prevent_imbalance 1 "prevent players from changing to larger teams"
+set g_balance_teams_queue 0 "queue players to maintain balance when they join during the match"
+set g_balance_teams_remove 0 "remove excess players from teams to maintain balance when someone leaves (currently does nothing in matches with more than 2 teams)"
+set g_balance_teams_remove_wait 10 "seconds to warn everyone before removing an excess player (0 = immediately)"
 set g_changeteam_banned 0 "not allowed to change team"
 
 set sv_teamnagger 1 "enable a nag message when the teams are unbalanced"