Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sun, 13 Aug 2017 15:43:51 +0000 (17:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 13 Aug 2017 15:43:51 +0000 (17:43 +0200)
commitfb5876e8defeb6af31e62002be26bdfa2beb56a7
treed6097ae0c236e96c555a09a6e8773617600e1a75
parentdc57512159414aa8440a384f82aaf163dc47218e
parent7e474d576080259e21690de30778b17029b5c0f2
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/bot/api.qh
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
qcsrc/server/bot/default/waypoints.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/sv_main.qc