Merge branch 'origin/master' (early part) into m0rfar/heaven

[xonotic/xonotic-maps.pk3dir.git] / scripts / common.shader

diff --git a/scripts/common.shader b/scripts/common.shader
index 80632b80e5b300083c128ff8a545ba3ee619c591..f544e10e593669057615c5cf67d5cbdc482ace8e 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -65,6 +65,17 @@ textures/common/hint // should NOT use surfaceparm hint.. strange but true
        surfaceparm hint        // ydnar: yes it should.\r
 }\r
 \r
+textures/common/hintskip\r
+{\r
+       qer_nocarve\r
+       qer_trans 0.30\r
+       surfaceparm nodraw\r
+       surfaceparm nonsolid\r
+       surfaceparm skip\r
+       surfaceparm structural\r
+       surfaceparm trans\r
+}\r
+\r
 textures/common/invisible // solid, transparent polygons, casts shadows\r
 {\r
        surfaceparm nolightmap\r
@@ -205,7 +216,7 @@ textures/common/warpzone
        surfaceparm trans\r
        surfaceparm nomarks\r
        {\r
-               map textures/common/mirror1.tga // fully transparent\r
+               map textures/common/warpzone/trans.tga // fully transparent\r
                blendfunc blend\r
        }\r
        dp_camera\r
@@ -215,7 +226,7 @@ textures/common/warpzone
 textures/common/camera\r
 {\r
        {\r
-               map textures/common/mirror1.tga // fully transparent\r
+               map textures/common/warpzone/trans.tga // fully transparent\r
                blendfunc blend\r
        }\r
        dp_camera\r