Merge branch 'Mario/remove_testcase'

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

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index c7b63f536cafb6cb442c89bd17d6716295c8f31b..ef011cffbc8784866086a3c37dcfef140fba4219 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -40,8 +40,8 @@ set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the play
 set sv_vote_nospectators 0 "only players can call a vote (thus spectators and observers can't call a vote): 0 = all people can vote, 1 = spectators can vote in warmup stage, 2 = only players can vote (no exceptions)."
 
 alias g_tourney "g_tourney_$1"
-alias g_tourney_1 "g_warmup 1; g_chat_nospectators 2; sv_vote_nospectators 1"
-alias g_tourney_0 "g_warmup 0; g_chat_nospectators 0; sv_vote_nospectators 0"
+alias g_tourney_1 "g_warmup 1; g_chat_nospectators 2; sv_vote_nospectators 1; sv_timeout 1"
+alias g_tourney_0 "g_warmup 0; g_chat_nospectators 0; sv_vote_nospectators 0; sv_timeout 0"
 
 set sv_timeout 0 "allow a player to call a timeout, this will pause the game for some time"
 set sv_timeout_length 120 "how long the game will be paused at max, in seconds"
@@ -399,6 +399,7 @@ sv_gameplayfix_delayprojectiles 0
 sv_gameplayfix_q2airaccelerate 1
 sv_gameplayfix_stepmultipletimes 1
 sv_gameplayfix_stepdown 2
+sv_gameplayfix_unstickplayers 2
 // only available in qc physics
 set sv_gameplayfix_stepdown_maxspeed 0 "maximum speed walking entities can be moving for stepping down to apply - requires sv_qcphysics 1"