Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)
13 files changed:
scripts/trak5x.shader
textures/trak5x/light/light_light2b.tga [new file with mode: 0644]
textures/trak5x/light/light_light2b_gloss.tga [new file with mode: 0644]
textures/trak5x/light/light_light2b_glow.tga [new file with mode: 0644]
textures/trak5x/light/light_light2b_norm.tga [new file with mode: 0644]
textures/trak5x/light/light_light2c.tga [new file with mode: 0644]
textures/trak5x/light/light_light2c_gloss.tga [new file with mode: 0644]
textures/trak5x/light/light_light2c_glow.tga [new file with mode: 0644]
textures/trak5x/light/light_light2c_norm.tga [new file with mode: 0644]
textures/trak5x/light/light_light2d.tga [new file with mode: 0644]
textures/trak5x/light/light_light2d_gloss.tga [new file with mode: 0644]
textures/trak5x/light/light_light2d_glow.tga [new file with mode: 0644]
textures/trak5x/light/light_light2d_norm.tga [new file with mode: 0644]

index 4bef45a41965068761561e9948681ff3407c5331..500ae26428e942299cc1ddc829150db5b199a272 100644 (file)
@@ -847,6 +847,63 @@ textures/trak5x/light-light2a
                map textures/trak5x/light/light_light2a.tga\r
                \r
 \r
+       }\r
+       {\r
+               map $lightmap\r
+               rgbGen identity\r
+               tcGen lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+textures/trak5x/light-light2b\r
+{\r
+       qer_editorimage textures/trak5x/light/light_light2b.tga\r
+       \r
+       q3map_bounceScale 1.25\r
+\r
+\r
+       {\r
+               map textures/trak5x/light/light_light2b.tga\r
+               \r
+\r
+       }\r
+       {\r
+               map $lightmap\r
+               rgbGen identity\r
+               tcGen lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+textures/trak5x/light-light2c\r
+{\r
+       qer_editorimage textures/trak5x/light/light_light2c.tga\r
+       \r
+       q3map_bounceScale 1.25\r
+\r
+\r
+       {\r
+               map textures/trak5x/light/light_light2c.tga\r
+               \r
+\r
+       }\r
+       {\r
+               map $lightmap\r
+               rgbGen identity\r
+               tcGen lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+textures/trak5x/light-light2d\r
+{\r
+       qer_editorimage textures/trak5x/light/light_light2d.tga\r
+       \r
+       q3map_bounceScale 1.25\r
+\r
+\r
+       {\r
+               map textures/trak5x/light/light_light2d.tga\r
+               \r
+\r
        }\r
        {\r
                map $lightmap\r
diff --git a/textures/trak5x/light/light_light2b.tga b/textures/trak5x/light/light_light2b.tga
new file mode 100644 (file)
index 0000000..c38151b
Binary files /dev/null and b/textures/trak5x/light/light_light2b.tga differ
diff --git a/textures/trak5x/light/light_light2b_gloss.tga b/textures/trak5x/light/light_light2b_gloss.tga
new file mode 100644 (file)
index 0000000..560f68f
Binary files /dev/null and b/textures/trak5x/light/light_light2b_gloss.tga differ
diff --git a/textures/trak5x/light/light_light2b_glow.tga b/textures/trak5x/light/light_light2b_glow.tga
new file mode 100644 (file)
index 0000000..fb1db65
Binary files /dev/null and b/textures/trak5x/light/light_light2b_glow.tga differ
diff --git a/textures/trak5x/light/light_light2b_norm.tga b/textures/trak5x/light/light_light2b_norm.tga
new file mode 100644 (file)
index 0000000..36d2245
Binary files /dev/null and b/textures/trak5x/light/light_light2b_norm.tga differ
diff --git a/textures/trak5x/light/light_light2c.tga b/textures/trak5x/light/light_light2c.tga
new file mode 100644 (file)
index 0000000..54dcb96
Binary files /dev/null and b/textures/trak5x/light/light_light2c.tga differ
diff --git a/textures/trak5x/light/light_light2c_gloss.tga b/textures/trak5x/light/light_light2c_gloss.tga
new file mode 100644 (file)
index 0000000..560f68f
Binary files /dev/null and b/textures/trak5x/light/light_light2c_gloss.tga differ
diff --git a/textures/trak5x/light/light_light2c_glow.tga b/textures/trak5x/light/light_light2c_glow.tga
new file mode 100644 (file)
index 0000000..c8c0902
Binary files /dev/null and b/textures/trak5x/light/light_light2c_glow.tga differ
diff --git a/textures/trak5x/light/light_light2c_norm.tga b/textures/trak5x/light/light_light2c_norm.tga
new file mode 100644 (file)
index 0000000..36d2245
Binary files /dev/null and b/textures/trak5x/light/light_light2c_norm.tga differ
diff --git a/textures/trak5x/light/light_light2d.tga b/textures/trak5x/light/light_light2d.tga
new file mode 100644 (file)
index 0000000..385a520
Binary files /dev/null and b/textures/trak5x/light/light_light2d.tga differ
diff --git a/textures/trak5x/light/light_light2d_gloss.tga b/textures/trak5x/light/light_light2d_gloss.tga
new file mode 100644 (file)
index 0000000..560f68f
Binary files /dev/null and b/textures/trak5x/light/light_light2d_gloss.tga differ
diff --git a/textures/trak5x/light/light_light2d_glow.tga b/textures/trak5x/light/light_light2d_glow.tga
new file mode 100644 (file)
index 0000000..885599e
Binary files /dev/null and b/textures/trak5x/light/light_light2d_glow.tga differ
diff --git a/textures/trak5x/light/light_light2d_norm.tga b/textures/trak5x/light/light_light2d_norm.tga
new file mode 100644 (file)
index 0000000..36d2245
Binary files /dev/null and b/textures/trak5x/light/light_light2d_norm.tga differ