Merge remote-tracking branch 'origin/atheros/item_keys'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:23 +0000 (11:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:23 +0000 (11:54 +0200)
14 files changed:
scripts/effects_warpzone.shader
scripts/ex2x.shader
scripts/facility114invx.shader
textures/effects_warpzone/greenedge.tga [new file with mode: 0644]
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]
textures/facility114invx/misc/lift02invgreen.tga [new file with mode: 0644]
textures/facility114invx/misc/lift02invgreen_gloss.tga [new file with mode: 0644]
textures/facility114invx/misc/lift02invgreen_norm.tga [new file with mode: 0644]
textures/facility114invx/misc/lift02invred.tga [new file with mode: 0644]
textures/facility114invx/misc/lift02invred_gloss.tga [new file with mode: 0644]
textures/facility114invx/misc/lift02invred_norm.tga [new file with mode: 0644]

index ebb9d26..dee4b2b 100644 (file)
@@ -38,6 +38,19 @@ textures/effects_warpzone/rededge
        }
 }
 
+textures/effects_warpzone/greenedge
+{
+       surfaceparm nonsolid
+       surfaceparm nomarks
+       q3map_surfacelight 2500
+       cull none
+       {
+               map textures/effects_warpzone/greenedge.tga
+               blendfunc GL_SRC_ALPHA GL_ONE
+       }
+}
+
+
 textures/effects_warpzone/warpzone_backdrop
 {
        surfaceparm nomarks
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
index 092aa6a..c200057 100644 (file)
@@ -216,6 +216,46 @@ textures/facility114invx/misc-lift02inv
                blendfunc filter
        }
 }
+textures/facility114invx/misc-lift02invred
+{
+       qer_editorimage textures/facility114invx/misc/lift02invred.tga
+       dpoffsetmapping - 1 match8 98
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114invx/misc/lift02invred.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/facility114invx/misc-lift02invgreen
+{
+       qer_editorimage textures/facility114invx/misc/lift02invgreen.tga
+       dpoffsetmapping - 1 match8 98
+       
+       q3map_bounceScale 1.25
+
+
+       {
+               map textures/facility114invx/misc/lift02invgreen.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
 textures/facility114invx/trim-trim00inv
 {
        qer_editorimage textures/facility114invx/trim/trim00inv.tga
diff --git a/textures/effects_warpzone/greenedge.tga b/textures/effects_warpzone/greenedge.tga
new file mode 100644 (file)
index 0000000..8b0f957
Binary files /dev/null and b/textures/effects_warpzone/greenedge.tga differ
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
diff --git a/textures/facility114invx/misc/lift02invgreen.tga b/textures/facility114invx/misc/lift02invgreen.tga
new file mode 100644 (file)
index 0000000..eeda123
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen.tga differ
diff --git a/textures/facility114invx/misc/lift02invgreen_gloss.tga b/textures/facility114invx/misc/lift02invgreen_gloss.tga
new file mode 100644 (file)
index 0000000..dd648a2
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen_gloss.tga differ
diff --git a/textures/facility114invx/misc/lift02invgreen_norm.tga b/textures/facility114invx/misc/lift02invgreen_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114invx/misc/lift02invgreen_norm.tga differ
diff --git a/textures/facility114invx/misc/lift02invred.tga b/textures/facility114invx/misc/lift02invred.tga
new file mode 100644 (file)
index 0000000..db53e67
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred.tga differ
diff --git a/textures/facility114invx/misc/lift02invred_gloss.tga b/textures/facility114invx/misc/lift02invred_gloss.tga
new file mode 100644 (file)
index 0000000..3bd3dae
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred_gloss.tga differ
diff --git a/textures/facility114invx/misc/lift02invred_norm.tga b/textures/facility114invx/misc/lift02invred_norm.tga
new file mode 100644 (file)
index 0000000..de85c54
Binary files /dev/null and b/textures/facility114invx/misc/lift02invred_norm.tga differ