Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Tue, 21 Aug 2018 11:52:30 +0000 (13:52 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 21 Aug 2018 11:52:30 +0000 (13:52 +0200)
commit338f8f4862627b3ee04cbdd20dc5590973614e01
treeeb082bf274aa1412baebc69f79f092574520b273
parent70bba988cd32922d29e40235db6ad1d8149bdc67
parent2a295e36ce93f87f6342b4bd0cdaebcc7faa69da
Merge branch 'master' into terencehill/bot_ai

# Conflicts:
# .gitlab-ci.yml
# qcsrc/common/gamemodes/gamemode/keepaway/keepaway.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/keepaway/keepaway.qc
qcsrc/server/bot/default/bot.qc