Merge remote branch 'origin/mand1nga/waypoints_space-elevator'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)
scripts/ex2x.shader
textures/ex2x/floor/floor_r1.tga [new file with mode: 0644]
textures/ex2x/floor/floor_r1_gloss.tga [new file with mode: 0644]
textures/ex2x/floor/floor_r1_norm.tga [new file with mode: 0644]

index 0de893dad598b469048a44449e75d1237555c81c..4e06645bc4dff8bc035581928cd83213e3a22e40 100644 (file)
@@ -373,7 +373,29 @@ textures/ex2x/floor-plate2
                blendfunc filter
        }
 }
-extures/ex2x/light-1
+textures/ex2x/floor-r1
+{
+       qer_editorimage textures/ex2x/floor/floor_r1.tga
+       
+       q3map_bounceScale  0.5
+       dpoffsetmapping - 0.5
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/ex2x/floor/floor_r1.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/ex2x/light-1
 {
        qer_editorimage textures/ex2x/light/light_1.tga
        
diff --git a/textures/ex2x/floor/floor_r1.tga b/textures/ex2x/floor/floor_r1.tga
new file mode 100644 (file)
index 0000000..1d92227
Binary files /dev/null and b/textures/ex2x/floor/floor_r1.tga differ
diff --git a/textures/ex2x/floor/floor_r1_gloss.tga b/textures/ex2x/floor/floor_r1_gloss.tga
new file mode 100644 (file)
index 0000000..57b2692
Binary files /dev/null and b/textures/ex2x/floor/floor_r1_gloss.tga differ
diff --git a/textures/ex2x/floor/floor_r1_norm.tga b/textures/ex2x/floor/floor_r1_norm.tga
new file mode 100644 (file)
index 0000000..f9bdc78
Binary files /dev/null and b/textures/ex2x/floor/floor_r1_norm.tga differ