Merge remote-tracking branch 'origin/cbrutail/texturesex2x-greentrims'

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 1fda6c912f8aee5a957d135484df24c316626799..0069b1a0c3abe2432fcc5b7643d85183e63f4d94 100644 (file)
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -453,6 +453,28 @@ textures/ex2x/light-beam_red
                map textures/ex2x/light/light_beam_red.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               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

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