From: terencehill Date: Fri, 6 Mar 2020 17:59:29 +0000 (+0100) Subject: Merge branch 'master' into terencehill/erebus_tweaks X-Git-Tag: xonotic-v0.8.5~1030^2~1 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=2a44628661e48eb9f6ddd26eb6ee38bd6b6755f0;hp=b971d1d36df30a37c483eaffd77ab90e888f494f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/erebus_tweaks --- diff --git a/textures/erebusfullbright_gloss.tga b/textures/erebusfullbright_gloss.tga index d2f981933..5004a7550 100644 Binary files a/textures/erebusfullbright_gloss.tga and b/textures/erebusfullbright_gloss.tga differ diff --git a/textures/erebusfullbright_reflect.tga b/textures/erebusfullbright_reflect.tga index 1c26b072c..a99f2d672 100644 Binary files a/textures/erebusfullbright_reflect.tga and b/textures/erebusfullbright_reflect.tga differ diff --git a/textures/nyxfullbright_gloss.tga b/textures/nyxfullbright_gloss.tga index f3f636dde..5004a7550 100644 Binary files a/textures/nyxfullbright_gloss.tga and b/textures/nyxfullbright_gloss.tga differ diff --git a/textures/nyxfullbright_reflect.tga b/textures/nyxfullbright_reflect.tga index 0052c20d6..a99f2d672 100644 Binary files a/textures/nyxfullbright_reflect.tga and b/textures/nyxfullbright_reflect.tga differ