Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sun, 17 Jun 2018 00:34:27 +0000 (03:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 17 Jun 2018 00:34:27 +0000 (03:34 +0300)
13 files changed:
1  2 
qcsrc/common/gamemodes/gamemode/assault/assault.qc
qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
qcsrc/common/gamemodes/gamemode/domination/domination.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
qcsrc/common/gamemodes/gamemode/invasion/invasion.qc
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/common/t_items.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge