Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Mon, 4 Jun 2018 18:12:40 +0000 (20:12 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 4 Jun 2018 18:12:40 +0000 (20:12 +0200)
commit6f68685178c1050cafeb711a2ffc05656d1fb3ea
treea58a9cb936b9ea29d2df047cabb5d3c0c0b73823
parent71902bc5e9acbc4cb5484cb58476631ebe85ba39
parent8f0ab1d38e9bda609bc56cf5d41ec348b489d723
Merge branch 'master' into terencehill/bot_ai
qcsrc/server/bot/default/aim.qc
qcsrc/server/bot/default/navigation.qc
xonotic-server.cfg