From: Mario <zacjardine@y7mail.com>
Date: Wed, 15 Mar 2017 21:03:40 +0000 (+0000)
Subject: Merge branch 'martin-t/overkill' into 'master'
X-Git-Tag: xonotic-v0.8.2~2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=e2f896a5a4e2fcfe07623a7dfdf634e2514fcd65;hp=15e25b6a91b5733f4cecda6ad0f938e9f34d6bdd

Merge branch 'martin-t/overkill' into 'master'

Mention overkill in server.cfg

See merge request !24
---

diff --git a/server/server.cfg b/server/server.cfg
index d96a053c..13bd988d 100644
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -190,6 +190,11 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 //g_powerups -1 // set to 0 to turn off strength/quad and shield/invincible, and set to 1 to turn them on even in game modes that normally have them turned off
 
 
+/////////////////////////////////////////////////////////////////////
+// Overkill mod settings
+
+// To enable Overkill, put 'exec defaultOverkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
+// You should also consider enabling 'g_fullbrightplayers 1'.
 
 
 /////////////////////////////////////////////////////////////////////