From: FruitieX Date: Tue, 12 Oct 2010 17:12:07 +0000 (+0300) Subject: Merge remote branch 'origin/master' into fruitiex/gakarmor X-Git-Tag: xonotic-v0.1.0preview~307^2~25^2~1^2^2 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=646837a15ec6b925c05d4740722d48e098ef2492;hp=6d9605e3a54e5a18274fb3b642677a80865be9a6 Merge remote branch 'origin/master' into fruitiex/gakarmor --- diff --git a/textures/gakarmor_glow.tga b/textures/gakarmor_glow.tga new file mode 100644 index 0000000000..946e6b5557 Binary files /dev/null and b/textures/gakarmor_glow.tga differ diff --git a/textures/pyria_glow.jpg b/textures/pyria_glow.jpg deleted file mode 100644 index 952dfd95ce..0000000000 Binary files a/textures/pyria_glow.jpg and /dev/null differ diff --git a/textures/pyria_glow.tga b/textures/pyria_glow.tga index b1161db172..53a46f3a80 100644 Binary files a/textures/pyria_glow.tga and b/textures/pyria_glow.tga differ diff --git a/textures/umbra_glow.jpg b/textures/umbra_glow.jpg deleted file mode 100644 index f18553a303..0000000000 Binary files a/textures/umbra_glow.jpg and /dev/null differ diff --git a/textures/umbra_glow.tga b/textures/umbra_glow.tga new file mode 100644 index 0000000000..ee222f67a0 Binary files /dev/null and b/textures/umbra_glow.tga differ