Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 3 Mar 2019 11:15:00 +0000 (12:15 +0100)
commit9e50112561ad6f4cefe6d13bd7185f5dfd1ada4b
treebfc76269bc273ea04d55f2d56a53ed1e52766329
parentb31df7475ddc09e86bbfda9ea9540c25a85c297d
parent2f86afcef72638295a3c8b16823fb5bbfddd1f69
Merge branch 'master' into terencehill/bot_ai
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/navigation.qc
xonotic-server.cfg