Merge remote branch 'refs/remotes/origin/cbrutail/skies_extragalactic'

diff --git a/scripts/exx.shader b/scripts/exx.shader
index fdcf18a08444374949cab22e64931ad0bcf97f0a..80254519922bda344d41b9af6e2ec0ae8d2060ba 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -330,6 +330,50 @@ textures/exx/floor-crete01
                map textures/exx/floor/floor_crete01.tga\r
                \r
 \r
+       }\r
+       {\r
+               map $lightmap\r
+               rgbGen identity\r
+               tcGen lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+textures/exx/floor-crete01-phoenix\r
+{\r
+       qer_editorimage textures/exx/floor/floor_crete01_phoenix.tga\r
+       \r
+       q3map_bounceScale  0.5\r
+       dpoffsetmapping - 2\r
+       dpglossintensitymod  3\r
+       dpglossexponentmod  4\r
+\r
+\r
+       {\r
+               map textures/exx/floor/floor_crete01_phoenix.tga\r
+               \r
+\r
+       }\r
+       {\r
+               map $lightmap\r
+               rgbGen identity\r
+               tcGen lightmap\r
+               blendfunc filter\r
+       }\r
+}\r
+textures/exx/floor-crete01-phoenixb\r
+{\r
+       qer_editorimage textures/exx/floor/floor_crete01_phoenixb.tga\r
+       \r
+       q3map_bounceScale  0.5\r
+       dpoffsetmapping - 2\r
+       dpglossintensitymod  3\r
+       dpglossexponentmod  4\r
+\r
+\r
+       {\r
+               map textures/exx/floor/floor_crete01_phoenixb.tga\r
+               \r
+\r
        }\r
        {\r
                map $lightmap\r

diff --git a/textures/exx/floor/floor_crete01_phoenix.tga b/textures/exx/floor/floor_crete01_phoenix.tga
new file mode 100644 (file)
index 0000000..a069158
Binary files /dev/null and b/textures/exx/floor/floor_crete01_phoenix.tga differ

diff --git a/textures/exx/floor/floor_crete01_phoenix_norm.tga b/textures/exx/floor/floor_crete01_phoenix_norm.tga
new file mode 100644 (file)
index 0000000..b9efb7c
Binary files /dev/null and b/textures/exx/floor/floor_crete01_phoenix_norm.tga differ

diff --git a/textures/exx/floor/floor_crete01_phoenixb.tga b/textures/exx/floor/floor_crete01_phoenixb.tga
new file mode 100644 (file)
index 0000000..5d8a929
Binary files /dev/null and b/textures/exx/floor/floor_crete01_phoenixb.tga differ

diff --git a/textures/exx/floor/floor_crete01_phoenixb_norm.tga b/textures/exx/floor/floor_crete01_phoenixb_norm.tga
new file mode 100644 (file)
index 0000000..b9efb7c
Binary files /dev/null and b/textures/exx/floor/floor_crete01_phoenixb_norm.tga differ