]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
scripts/ex2x.shader
scripts/map_space-elevator.shader
scripts/phillipk2x.shader

index 0069b1a0c3abe2432fcc5b7643d85183e63f4d94..5ca03aaccc318aba0c600e5fa9ee75a4981f69ef 100644 (file)
@@ -53,6 +53,7 @@ textures/ex2x/base-chainlink
 
        surfaceparm trans
        cull none
+       surfaceparm alphashadow
 
        {
                map textures/ex2x/base/base_chainlink.tga
index 19353c9643aa28de5c91052566e9893ecec514e0..be97c6f396d2665cef0eae018e574d4e137b2633 100644 (file)
@@ -1,6 +1,6 @@
 textures/map_space-elevator/hangwires
 {
-       surfaceparm nolightmap
+       surfaceparm alphashadow
        surfaceparm nomarks
        surfaceparm trans
        cull disable
index e54d052fbd8ff5af83fa1abf8c7ce829595a83e0..41591b98a2e91f472272b6ee6036d2456a201c01 100644 (file)
@@ -678,6 +678,7 @@ textures/phillipk2x/floor-pk02_floor07
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor07
@@ -788,6 +789,7 @@ textures/phillipk2x/floor-pk02_floor10
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       sufraceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor10
@@ -876,6 +878,7 @@ textures/phillipk2x/floor-pk02_floor13a
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor13a
@@ -898,6 +901,7 @@ textures/phillipk2x/floor-pk02_floor13b
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor13b