From: Lyberta <lyberta@lyberta.net>
Date: Thu, 29 Jun 2017 11:54:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cf0f285e8ab03dfacf9ca27c5ff972db1247c86;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
---

6cf0f285e8ab03dfacf9ca27c5ff972db1247c86
diff --cc qcsrc/server/g_world.qc
index 31dd839ca,42c64e6a3..a3f2fb32d
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -279,8 -282,8 +282,9 @@@ void cvar_changes_init(
  		BADCVAR("g_race_laps_limit");
  		BADCVAR("g_race_qualifying_timelimit");
  		BADCVAR("g_race_qualifying_timelimit_override");
+ 		BADCVAR("g_runematch");
  		BADCVAR("g_snafu");
 +		BADCVAR("g_surv"); // Lyberta: adding gamemode cvar
  		BADCVAR("g_tdm");
  		BADCVAR("g_tdm_teams");
  		BADCVAR("g_vip");