]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35c98d8 625bc55)
Merge branch 'terencehill/item_models' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 5 Dec 2016 12:58:27 +0000 (12:58 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 5 Dec 2016 12:58:27 +0000 (12:58 +0000)
item models

* Apply correct buff bbox after it respawns
* Make taller powerup, mega and buff bboxes so the real item is always inside it. It fixes #192

See merge request !396


Trivial merge