Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Wed, 20 Jun 2018 10:07:20 +0000 (12:07 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 20 Jun 2018 10:07:20 +0000 (12:07 +0200)
commit4096ab0591cbd7fac803e022375cd3c221511d8b
tree56ede2caa11cb7b557eaba64f196a98b91b64f9e
parent88a5c43608df68db1ca68cb8135cd2f057994c51
parentc128310d86eea9d95a81adb1a1e85c434d8e5c35
Merge branch 'master' into terencehill/bot_ai

# Conflicts:
# qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
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/keepaway/keepaway.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/havocbot/roles.qc
qcsrc/server/bot/default/navigation.qc
xonotic-server.cfg