]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3851515 504f56f)
Merge branch 'terencehill/bot_ai' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 22 Jan 2018 11:28:22 +0000 (11:28 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 22 Jan 2018 11:28:22 +0000 (11:28 +0000)
Bot AI improvements

See merge request xonotic/xonotic-data.pk3dir!513

1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qh patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/common/t_items.qh
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge