]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:14:38 +0000 (02:14 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:14:38 +0000 (02:14 +0300)
1  2 
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
index 31dd839ca198a77cee3e37f6feb4e8de4ab6d80c,42c64e6a33ece7333b8d557d27aa4a64d47f90bc..a3f2fb32d6c3b853166ab748a1a2afa997aeefdc
@@@ -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");