Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:15:27 +0000 (13:15 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:15:27 +0000 (13:15 +0300)
commit16bb4a51347c40ae0655bba054bc7cf201538e45
tree4e66cc29fdce49c7e8e3706549c35bbe86b8ada1
parent76de60deecae125795551ba1a4576a265d7ae7de
parentb2e3660c5c919d8be9594934e8f6eec9b82346a3
Merge branch 'master' into Lyberta/TeamplayOverhaul
qcsrc/common/t_items.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/g_world.qh
qcsrc/server/player.qc
qcsrc/server/player.qh
qcsrc/server/teamplay.qc