Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Tue, 17 Jul 2018 15:19:59 +0000 (17:19 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 17 Jul 2018 15:19:59 +0000 (17:19 +0200)
commit70bba988cd32922d29e40235db6ad1d8149bdc67
tree724b24477e74224d778fde5005274d5d096d90d2
parentd5e34836b0af6685b1c5aad493d6000f38d1ef25
parentaa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733
Merge branch 'master' into terencehill/bot_ai
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/keyhunt/keyhunt.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/server/bot/default/bot.qc