Merge branch 'sev/lumaIcons' into 'master'

Add new HUD icons for overkill and assault

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

diff --git a/gfx/hud/default/as_defend.tga b/gfx/hud/default/as_defend.tga
new file mode 100644 (file)
index 0000000..5aca85e
Binary files /dev/null and b/gfx/hud/default/as_defend.tga differ

diff --git a/gfx/hud/default/as_destroy.tga b/gfx/hud/default/as_destroy.tga
new file mode 100644 (file)
index 0000000..7c779a1
Binary files /dev/null and b/gfx/hud/default/as_destroy.tga differ

diff --git a/gfx/hud/luma/as_defend.tga b/gfx/hud/luma/as_defend.tga
new file mode 100644 (file)
index 0000000..5aca85e
Binary files /dev/null and b/gfx/hud/luma/as_defend.tga differ

diff --git a/gfx/hud/luma/as_destroy.tga b/gfx/hud/luma/as_destroy.tga
new file mode 100644 (file)
index 0000000..7c779a1
Binary files /dev/null and b/gfx/hud/luma/as_destroy.tga differ

diff --git a/gfx/hud/luma/ok_weapon_rail.tga b/gfx/hud/luma/ok_weapon_rail.tga
index e2e83ae7588ba17ef77aa1f1278f29a69901111a..b90d291fb40646d6ffdbcd7e5845b3835b63c12c 100644 (file)
Binary files a/gfx/hud/luma/ok_weapon_rail.tga and b/gfx/hud/luma/ok_weapon_rail.tga differ

diff --git a/gfx/hud/luma/ok_weapon_shotgun.tga b/gfx/hud/luma/ok_weapon_shotgun.tga
index f5fb92e13ee7bcc11b2809755883a44531fe0b18..b0e7bf9327d5d95350ed74ec1f7589171882963b 100644 (file)
Binary files a/gfx/hud/luma/ok_weapon_shotgun.tga and b/gfx/hud/luma/ok_weapon_shotgun.tga differ

diff --git a/gfx/hud/luma/ok_weapon_smg.tga b/gfx/hud/luma/ok_weapon_smg.tga
index 5aee32ab545a47884f50cd00ce4248e8cb35ab3c..cb26a1657dd0f04c2775e9d9323327885a5cc918 100644 (file)
Binary files a/gfx/hud/luma/ok_weapon_smg.tga and b/gfx/hud/luma/ok_weapon_smg.tga differ