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)
commit6c27fe90b0454df3dbf7b098bc554fcb5eaa75d0
tree1bb61ec5e4f22913f9c2b1d383fe2a39c1f462f5
parent69b02d720a393dccb8bec7bd96dd366413a28ef7
parentc6f3178089a11e4c8111b5dfd524fbc89cd03776
Merge branch 'master' into Lyberta/TeamplayOverhaul
13 files changed:
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