Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Tue, 10 Jul 2018 04:06:30 +0000 (07:06 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 10 Jul 2018 04:06:30 +0000 (07:06 +0300)
commit69eda62d02bc02ff50547bad514af3f7ce487413
treecea0a991c7681575f314c064969b55c71684bf4c
parent6c27fe90b0454df3dbf7b098bc554fcb5eaa75d0
parent23dd6f2c565d74ee081b453d5666a73c7ed3f0a4
Merge branch 'master' into Lyberta/TeamplayOverhaul
14 files changed:
qcsrc/common/gamemodes/gamemode/assault/assault.qc
qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qc
qcsrc/common/gamemodes/gamemode/domination/domination.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.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/command/sv_cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/player.qh