Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Mon, 15 Jan 2018 16:57:12 +0000 (17:57 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 15 Jan 2018 16:57:12 +0000 (17:57 +0100)
commit13e8382b4bd9c0de8bcfd2a96f56e638ba5d431d
tree397838db710db903925c902ea5dd12642c0bdcd2
parentddba29912342c2aacb1686062d4e4cd148503c29
parent1f1371d2ce1d6b49f22a8c1d4f449be4021c2d00
Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/server/mutators/mutator/gamemode_race.qc
defaultServer.cfg
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/bot/default/navigation.qh
qcsrc/server/bot/default/waypoints.qc
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_race.qc