From: Rudolf Polzer Date: Wed, 29 Sep 2010 08:50:47 +0000 (+0200) Subject: Squashed commit of the following: X-Git-Tag: xonotic-v0.1.0preview~137 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4dc230f;p=xonotic%2Fxonotic-maps.pk3dir.git Squashed commit of the following: commit aab33b915a80346378e8244e1b695cf4be349af7 Author: FruitieX Date: Sun Jul 25 01:35:43 2010 +0300 purple pipe color commit d0d5e2eff3a14133018eb2e0bb7c36c03e01024b Author: FruitieX Date: Sat Jul 24 23:17:21 2010 +0300 grate texture commit 3dcf16c12c72a62f9e6ed0021af55e8f4302b47d Author: FruitieX Date: Sat Jul 24 22:50:26 2010 +0300 wrn01 colors --- diff --git a/scripts/exx.shader b/scripts/exx.shader index 035a9bd0..5fe332aa 100644 --- a/scripts/exx.shader +++ b/scripts/exx.shader @@ -709,6 +709,75 @@ textures/exx/floor-wrn01 } } +textures/exx/floor-wrn01-blue +{ + qer_editorimage textures/exx/floor/floor_wrn01-blue.tga + + q3map_bounceScale 0.75 + dpoffsetmapping - 2 + dpglossintensitymod 3 + dpglossexponentmod 4 + + + { + map textures/exx/floor/floor_wrn01-blue.tga + + + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} + +textures/exx/floor-wrn01-red +{ + qer_editorimage textures/exx/floor/floor_wrn01-red.tga + + q3map_bounceScale 0.75 + dpoffsetmapping - 2 + dpglossintensitymod 3 + dpglossexponentmod 4 + + + { + map textures/exx/floor/floor_wrn01-red.tga + + + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} + +textures/exx/floor-wrn01-purple +{ + qer_editorimage textures/exx/floor/floor_wrn01-purple.tga + + q3map_bounceScale 0.75 + dpoffsetmapping - 2 + dpglossintensitymod 3 + dpglossexponentmod 4 + + + { + map textures/exx/floor/floor_wrn01-purple.tga + + + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} + textures/exx/light-panel01 { qer_editorimage textures/exx/light/light_panel01.tga @@ -797,6 +866,35 @@ textures/exx/light-u201-surfacelight blendfunc filter } } +textures/exx/panel-grate01 +{ + qer_editorimage textures/exx/panel/panel_grate01.tga + + surfaceparm metalsteps + q3map_bounceScale 2 + dpoffsetmapping - 2 + dpglossintensitymod 3 + dpglossexponentmod 4 + + surfaceparm nomarks + surfaceparm trans + surfaceparm alphashadow + + cull none + nopicmip + nomipmaps + { + map textures/exx/panel/panel_grate01.tga + alphaFunc GT0 + rgbgen vertex + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} textures/exx/panel-metal01 { qer_editorimage textures/exx/panel/panel_metal01.tga diff --git a/scripts/trak5x.shader b/scripts/trak5x.shader index e12c9592..32396f2f 100644 --- a/scripts/trak5x.shader +++ b/scripts/trak5x.shader @@ -161,6 +161,25 @@ textures/trak5x/base-pipe1d map textures/trak5x/base/base_pipe1d.tga + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} +textures/trak5x/base-pipe1e +{ + qer_editorimage textures/trak5x/base/base_pipe1e.tga + + q3map_bounceScale 1.25 + + + { + map textures/trak5x/base/base_pipe1e.tga + + } { map $lightmap diff --git a/textures/exx/floor/floor_wrn01-blue.tga b/textures/exx/floor/floor_wrn01-blue.tga new file mode 100644 index 00000000..f7df1d8e Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue.tga differ diff --git a/textures/exx/floor/floor_wrn01-blue_gloss.tga b/textures/exx/floor/floor_wrn01-blue_gloss.tga new file mode 100644 index 00000000..13b83d88 Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue_gloss.tga differ diff --git a/textures/exx/floor/floor_wrn01-blue_norm.tga b/textures/exx/floor/floor_wrn01-blue_norm.tga new file mode 100644 index 00000000..144a981b Binary files /dev/null and b/textures/exx/floor/floor_wrn01-blue_norm.tga differ diff --git a/textures/exx/floor/floor_wrn01-purple.tga b/textures/exx/floor/floor_wrn01-purple.tga new file mode 100644 index 00000000..f4487128 Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple.tga differ diff --git a/textures/exx/floor/floor_wrn01-purple_gloss.tga b/textures/exx/floor/floor_wrn01-purple_gloss.tga new file mode 100644 index 00000000..13b83d88 Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple_gloss.tga differ diff --git a/textures/exx/floor/floor_wrn01-purple_norm.tga b/textures/exx/floor/floor_wrn01-purple_norm.tga new file mode 100644 index 00000000..144a981b Binary files /dev/null and b/textures/exx/floor/floor_wrn01-purple_norm.tga differ diff --git a/textures/exx/floor/floor_wrn01-red.tga b/textures/exx/floor/floor_wrn01-red.tga new file mode 100644 index 00000000..09e20826 Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red.tga differ diff --git a/textures/exx/floor/floor_wrn01-red_gloss.tga b/textures/exx/floor/floor_wrn01-red_gloss.tga new file mode 100644 index 00000000..13b83d88 Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red_gloss.tga differ diff --git a/textures/exx/floor/floor_wrn01-red_norm.tga b/textures/exx/floor/floor_wrn01-red_norm.tga new file mode 100644 index 00000000..144a981b Binary files /dev/null and b/textures/exx/floor/floor_wrn01-red_norm.tga differ diff --git a/textures/exx/panel/panel_grate01.tga b/textures/exx/panel/panel_grate01.tga new file mode 100644 index 00000000..5abf61f9 Binary files /dev/null and b/textures/exx/panel/panel_grate01.tga differ diff --git a/textures/exx/panel/panel_grate01_gloss.tga b/textures/exx/panel/panel_grate01_gloss.tga new file mode 100644 index 00000000..093328c6 Binary files /dev/null and b/textures/exx/panel/panel_grate01_gloss.tga differ diff --git a/textures/trak5x/base/base_pipe1e.tga b/textures/trak5x/base/base_pipe1e.tga new file mode 100644 index 00000000..9b379e00 Binary files /dev/null and b/textures/trak5x/base/base_pipe1e.tga differ diff --git a/textures/trak5x/base/base_pipe1e_gloss.tga b/textures/trak5x/base/base_pipe1e_gloss.tga new file mode 100644 index 00000000..54dae95f Binary files /dev/null and b/textures/trak5x/base/base_pipe1e_gloss.tga differ diff --git a/textures/trak5x/base/base_pipe1e_norm.tga b/textures/trak5x/base/base_pipe1e_norm.tga new file mode 100644 index 00000000..223091e3 Binary files /dev/null and b/textures/trak5x/base/base_pipe1e_norm.tga differ