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)
# Conflicts:
# qcsrc/common/gamemodes/gamemode/ctf/ctf.qc

1  2 
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

Simple merge
Simple merge