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)
1  2 
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/navigation.qc
xonotic-server.cfg

Simple merge