Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...
authorterencehill <piuntn@gmail.com>
Sat, 2 Dec 2017 21:36:00 +0000 (22:36 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 2 Dec 2017 21:36:00 +0000 (22:36 +0100)
commitf84d4c215d826d9b035e1ba79a22af077f123f55
treeed3ad85a2a4a3c51b6bd719fa4e5583562b782ed
parent3b4c3d10c70529e970952f183a7ee8fa3a00c2f7
parent042089583dd3eae6bbe1cbdf85bd694d5bd1bb0c
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/server/bot/default/navigation.qh
defaultServer.cfg
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/default/havocbot/roles.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/mutators/mutator/gamemode_cts.qc