Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 08:35:27 +0000 (11:35 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 08:35:27 +0000 (11:35 +0300)
commit76de60deecae125795551ba1a4576a265d7ae7de
tree7cc5bd8c9689de5bea3201293a5dc9a37be3ab4c
parent5896259929573bd6f2bef7053022409eedfeb494
parent94f293de630d6173c5303adf65e45d4f4a83863a
Merge branch 'master' into Lyberta/TeamplayOverhaul
19 files changed:
qcsrc/common/gamemodes/gamemode/assault/assault.qc
qcsrc/common/gamemodes/gamemode/clanarena/clanarena.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/keyhunt/keyhunt.qc
qcsrc/common/gamemodes/gamemode/race/race.qc
qcsrc/common/gamemodes/gamemode/tdm/tdm.qc
qcsrc/common/gamemodes/sv_rules.qh
qcsrc/common/t_items.qc
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/teamplay.qc