Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Thu, 14 Jun 2018 12:38:21 +0000 (14:38 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 14 Jun 2018 12:38:21 +0000 (14:38 +0200)
commit5aab6120acfc624751d20a695d1b911b3e919831
tree3415fac092a43651f245c61292999ab4725bf2ad
parent960a31b121488256a7eebcd6a22d0157b88643a7
parenta1970558fd84aab0e71ef390a5a705ed2b198200
Merge branch 'master' into terencehill/bot_ai
14 files changed:
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/keyhunt/keyhunt.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/common/items/item/powerup.qh
qcsrc/server/bot/default/aim.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