Merge branch 'martin-t/mg-solidpen' into 'master'

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

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 9dbfdc8f692a1862590ca8b42db06b91b1c69e89..cb3a550ae6db9a2b9aad575a34d30be2909839d6 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -32,6 +32,8 @@ set g_warmup_allow_timeout 0  "allow calling timeouts in the warmup-stage (if sv_
 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"
 
+alias sv_hook_warmupend
+
 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     "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)."