Merge remote-tracking branch 'origin/cbrutail/texturesex2x-greentrims'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 9 Oct 2011 14:21:34 +0000 (16:21 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 9 Oct 2011 14:21:34 +0000 (16:21 +0200)
scripts/ex2x.shader
textures/ex2x/light/light_beam_green.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_green_gloss.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_green_glow.tga [new file with mode: 0644]
textures/ex2x/light/light_beam_green_norm.tga [new file with mode: 0644]

index 1fda6c9..0069b1a 100644 (file)
@@ -461,6 +461,28 @@ textures/ex2x/light-beam_red
                blendfunc filter
        }
 }
+textures/ex2x/light-beam_green
+{
+       qer_editorimage textures/ex2x/light/light_beam_green.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 0.5 match8 99
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/ex2x/light/light_beam_green.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
 textures/ex2x/trim-green2
 {
        qer_editorimage textures/ex2x/trim/trim_green2.tga
diff --git a/textures/ex2x/light/light_beam_green.tga b/textures/ex2x/light/light_beam_green.tga
new file mode 100644 (file)
index 0000000..0a5b648
Binary files /dev/null and b/textures/ex2x/light/light_beam_green.tga differ
diff --git a/textures/ex2x/light/light_beam_green_gloss.tga b/textures/ex2x/light/light_beam_green_gloss.tga
new file mode 100644 (file)
index 0000000..b5e08cf
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_gloss.tga differ
diff --git a/textures/ex2x/light/light_beam_green_glow.tga b/textures/ex2x/light/light_beam_green_glow.tga
new file mode 100644 (file)
index 0000000..eb3cb16
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_glow.tga differ
diff --git a/textures/ex2x/light/light_beam_green_norm.tga b/textures/ex2x/light/light_beam_green_norm.tga
new file mode 100644 (file)
index 0000000..f179cb6
Binary files /dev/null and b/textures/ex2x/light/light_beam_green_norm.tga differ