]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/bot_AI_improvements 409/head
authorterencehill <piuntn@gmail.com>
Fri, 17 Feb 2017 18:37:59 +0000 (19:37 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 17 Feb 2017 18:37:59 +0000 (19:37 +0100)
commitf94eb06cd0ff401f63e8e8c81f55961544846ee6
tree8b629e4573d74f4bcd4f042d240fdae7dec98a28
parent3d8f59ba7974cebd7e4796c84d0b80a10c5f0b7a
parent7ee5673f30485bb1feb91f3fb19cafd8baa71ff5
Merge branch 'master' into terencehill/bot_AI_improvements
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/t_items.qc