]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'terencehill/health_armor_icons' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 21 Nov 2021 21:57:43 +0000 (21:57 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 21 Nov 2021 21:57:43 +0000 (21:57 +0000)
commitfa71e4e191e6d10467a7bca2ea5cbde5628546ec
tree398554866bae429ce46ab5305661f3233b60abdb
parentd9877a41f2f1371095f691972914b820fda527a5
parent085858c810697c96731638dc5a38a3ac8d3f86fd
Merge branch 'terencehill/health_armor_icons' into 'master'

Add proper health / armor icons (used by the ItemStats and ItemsTime panels)

Closes #2561

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