Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...
authorterencehill <piuntn@gmail.com>
Sun, 24 Dec 2017 17:47:43 +0000 (18:47 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 24 Dec 2017 17:47:43 +0000 (18:47 +0100)
commit4299b97f93fc4753665e198066970bd51bb3b06a
tree00047699424e15f9ff34cd38911199de2d66298a
parent987569ab4235025ad7efe3817b2b049d4fda7b5a
parent99f5aae787d0e46852e2340594c5cb4805c0f3f3
Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
# qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/server/bot/default/bot.qc