Merge branch 'maddin/textures-phillipk2x-cleanup' into 'master'

Maddin/textures phillipk2x cleanup

This cleans up the phillipk2x shaders and adds some features:
* Overall better formatting of the shader file.
* Shaders that have an alpha channel, like grates, now work properly.
* Decals are now decals and not opaque textures.
* The glow of all light and computer textures has been adjusted to show their respective colour instead of pure white.

See merge request !46

diff --git a/maps/dance.map.options b/maps/dance.map.options
index f45ea47063278b45281663b518f78cba7ed69eaf..c48c877b6103dc3a4d630a6cbeb4a753b2833258 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -1,6 +1,6 @@
--bsp + -samplesize 6
--light + -bounce 8 -dirtscale 2
+-bsp + -samplesize 4
 -vis +
+-light + -bounce 8 -dirtscale 2 -gamma 0.7
 -minimap +
 -sRGB
-Version: 5c
+Version: 5d

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 99cd15628239a044324d150670ffa1f8219d57dd..6480c33d8073db89541f3ca2c83897b1be9a8822 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -1,7 +1,7 @@
 -scale 1:1.3
 -bsp + -samplesize 6
--light + -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -vis +
+-light + -gamma 0.75 -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -minimap +
 -sRGB
-Version: 13f
\ No newline at end of file
+Version: 13g

diff --git a/maps/implosion.map b/maps/implosion.map
index e8caf7d8c7791cf7bca49d278af20c1ee1602c67..41de7971025a9dd35065aeb1c03234fb8c23cd58 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -61083,14 +61083,6 @@ trak5x/light-light2b-surfacelight
 ( -428 -1992 0 ) ( -428 -1968 0 ) ( -428 -1992 8 ) trak5x/base-base1b 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1552 4488 -1468 ) ( 1552 -6264 -1468 ) ( -1520 4488 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 1536 292 -1468 ) ( -1536 292 -1468 ) ( 1536 292 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 6136 4380 -1468 ) ( 6136 4380 -1532 ) ( 6136 -6372 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1520 -6264 -1532 ) ( 1552 -6264 -1532 ) ( -1520 4488 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1516 -6220 -1532 ) ( -1516 -6220 -1468 ) ( 1556 -6220 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1544 -6256 -1532 ) ( -1544 4496 -1532 ) ( -1544 -6256 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 2064 -2688 384 ) ( 2064 -3144 384 ) ( 1984 -2688 384 ) trak5x/floor-tile4e 64 240 0 0.5 0.5 0 0 0
 ( 2064 -2720 384 ) ( 1984 -2720 384 ) ( 2064 -2720 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2400 -2680 384 ) ( 2400 -2680 320 ) ( 2400 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index bf3ed8fdde6b19caa72cbbf6393d9678ded9131a..fc867f009cc78fda89bc24c3455d2a0e00cbff9e 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -3,4 +3,4 @@
 -vis + 
 -minimap +
 -sRGB
-Version: 2b
+Version: 2c

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index b719e51dd686a30299bfc5b79ffe75501dd78b5b..6bd94e2ca657505f99c903653ac49abcf2599324 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -1,6 +1,6 @@
 -bsp +
--light + -bounce 8
 -vis +
+-light + -bounce 8
 -minimap +
 -sRGB
-Version: 6a
+Version: 6b

diff --git a/maps/warfare.map b/maps/warfare.map
index e26083f7be6d704f0fa69bd81ba0c8f9088c0855..8931609251644dda04240432de5fd854ceda07a7 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,8 +1,8 @@
 {
 "classname" "worldspawn"
 "_floodlight" "178 209 255 1024 16"
-"fog" "1 0 0.5 0.8 0.1"
-"_description" "Medium sized map with a central area. Well suited and optimized for duel matches"
+"fog" "1 0 0.5 0.8 0.12"
+"_description" "Medium sized map with a central area. Well suited and optimized for duel matches."
 "message" "Warfare"
 "author" "Maddin, Tymo"
 {
@@ -9353,21 +9353,21 @@ trak5x/base-pipe1b
 }
 {
 ( -376 -1128 200 ) ( -376 -1128 88 ) ( -364 -1140 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070313 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
+( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070312 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
 ( -400 -1152 200 ) ( -376 -1128 200 ) ( -388 -1164 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -400 -1152 88 ) ( -400 -1152 200 ) ( -388 -1164 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 352 ) ( -364 -1140 352 ) ( -388 -1164 224 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -364 -1140 200 ) ( -376 -1128 200 ) ( -376 -1128 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570313 20 0.1787835211 0.1787800044 134217728 0 0
+( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570312 20 0.1787835211 0.1787800044 134217728 0 0
 ( -388 -1164 88 ) ( -376 -1128 88 ) ( -400 -1152 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 200 ) ( -400 -1152 88 ) ( -400 -1152 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 64 ) ( -364 -1140 -64 ) ( -388 -1164 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -500 -1004 88 ) ( -488 -1016 88 ) ( -488 -1016 200 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570313 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
+( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570312 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
 ( -524 -1028 200 ) ( -488 -1016 200 ) ( -512 -1040 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 88 ) ( -512 -1040 200 ) ( -512 -1040 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 224 ) ( -500 -1004 352 ) ( -524 -1028 352 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -20232,7 +20232,7 @@ exx/base-metal04
 ( -680 200 360 ) ( -728 200 360 ) ( -680 200 408 ) common/caulk 32 128 -90 0.25 0.25 0 0 0
 ( -680 204 408 ) ( -680 204 360 ) ( -680 192 360 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -680 200 360 ) ( -680 216 360 ) ( -728 200 360 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
-( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039063 -90 0.375 0.375 0 0 0
+( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039062 -90 0.375 0.375 0 0 0
 ( -728 204 360 ) ( -728 204 408 ) ( -728 192 408 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -728 216 408 ) ( -680 216 408 ) ( -728 200 408 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
 }
@@ -20296,7 +20296,7 @@ exx/base-metal04
 ( -680 200 520 ) ( -728 200 520 ) ( -680 200 568 ) common/caulk 160 128 -90 0.25 0.25 0 0 0
 ( -680 204 568 ) ( -680 204 520 ) ( -680 192 520 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -680 200 520 ) ( -680 216 520 ) ( -728 200 520 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
-( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039063 -90 0.375 0.375 0 0 0
+( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039062 -90 0.375 0.375 0 0 0
 ( -728 204 520 ) ( -728 204 568 ) ( -728 192 568 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -728 216 568 ) ( -680 216 568 ) ( -728 200 568 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
 }
@@ -30147,20 +30147,20 @@ exx/base-metal07rust
 ( -152 -16 64 ) ( -144 -16 -64 ) ( -152 -16 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
+( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/botclip 0 0 0 0.5 0.5 0 0 0
 }
 {
-( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/botclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -272 128 320 ) ( -272 224 320 ) ( -240 224 320 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
@@ -32060,7 +32060,7 @@ exx/base-metal05rust
 {
 "classname" "info_autoscreenshot"
 "origin" "-352.795746 436.263397 546.231445"
-"angles" "13.5955811 -42.791748 0"
+"angles" "14 -43 0"
 }
 {
 "classname" "info_location"
@@ -32186,9 +32186,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-26.000000 133.000000 -20.000000"
+"origin" "-507.999939 -1143.000000 57.999908"
 "model" "models/map_warfare/boulder_1.md3"
 "modelscale" "0.700000"
+"spawnflags" "4"
+"angles" "-5.922283 -8.308860 17.080246"
 }
 {
 "classname" "misc_model"
@@ -32246,10 +32248,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-157.000000 -215.000000 -12.000000"
+"origin" "-315.000000 -1219.000122 76.000015"
 "model" "models/map_warfare/small_rocks.md3"
 "modelscale" "7.000000"
 "spawnflags" "4"
+"angles" "4.682997 0.236063 2.888983"
 }
 {
 "classname" "misc_model"
@@ -32360,72 +32363,126 @@ exx/base-metal05rust
 "spawnflags" "4"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "45.117275 203.765335 -15.592969"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "-6.765636 118.298286 13.803299"
+"classname" "info_autoscreenshot"
+"origin" "76.4626083 -1187.55554 541.621399"
+"angles" "4 45 0"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "435.049530 749.831360 122.260620"
+"classname" "item_shells"
+"origin" "792.000000 632.000000 352.000000"
+}
+{
+"classname" "misc_model"
+"origin" "45.117275 203.765335 -15.592969"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
-"angles" "11.806162 119.315575 10.049067"
+"angles" "-6.765636 118.298286 13.803299"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-715.604431 -540.102966 477.999847"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
 "angles" "5.093612 -21.180624 1.177875"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-797.990234 -165.049042 476.308502"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
 "angles" "-0.589641 14.992217 9.155036"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-781.094238 13.795942 475.191956"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.500000"
 "angles" "-6.289028 137.856934 1.316799"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "420.221466 -821.656311 472.003845"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "4.660039 50.702106 2.371722"
-}
-{
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "649.648193 -1338.152832 352.140930"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.800000"
 "angles" "-19.621141 -165.325974 -31.031652"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "1180.248657 -817.675537 292.009247"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.800000"
 "angles" "5.276835 47.410706 15.626326"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "info_autoscreenshot"
-"origin" "76.4626083 -1187.55554 541.621399"
-"angles" "4.22424316 45.2526855 0"
+"classname" "misc_model"
+"origin" "435.049530 749.831360 122.260620"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "11.806162 119.315575 10.049067"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "info_autoscreenshot"
-"origin" "561.64978 153.942505 247.010666"
-"angles" "13.9910889 -157.664795 0"
+"classname" "misc_model"
+"origin" "420.221466 -821.656311 472.003845"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "4.660039 50.702106 2.371722"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "item_shells"
-"origin" "792.000000 632.000000 352.000000"
+"classname" "misc_model"
+"origin" "1423.000000 591.000061 130.000092"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "12.074849 5.873147 -9.703994"
+"modelscale_vec" "1.000000 1.000000 1.300000"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-432.000000 -1180.000122 75.000008"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "2.804623 95.043098 -9.026549"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-26.000000 133.000000 -20.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-585.000000 -950.000000 69.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-157.000000 -215.000000 -12.000000"
+"model" "models/map_warfare/small_rocks.md3"
+"modelscale" "7.000000"
+"spawnflags" "4"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "616.000000 168.000000 256.000000"
+"angles" "5 205 0"
 }

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index 6c2dedd2bee522b255ed1bf4135f2885d855a556..7c7591da6e3dc6842950d5cef26813d8a53b2de3 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -1,6 +1,6 @@
 -bsp +
--light + -dirtscale 2 -bounce 8
+-light + -dirtscale 2 -bounce 3 -bouncescale 4
 -vis +
 -minimap +
 -sRGB
-Version: 6e
+Version: 7
\ No newline at end of file

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index 5c7f82dd7f7594c920db4cf22369e72c6f4bbcbb..a8b4714ce83688f1389d97713880eebd1afea534 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -1,5 +1,5 @@
 title Warfare
-description Medium sized map with a central area. Well suited and optimized for duel matches
+description Medium sized map with a central area. Well suited and optimized for duel matches.
 author Maddin, Tymo
 cdtrack 15
 has weapons

diff --git a/scripts/common.shader b/scripts/common.shader
index 466e522c41ef112b545272f0ae98ed3f14e8644c..68c77762722e56f4fe2b34e46b739aa352309cdb 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -1,202 +1,202 @@
 textures/common/antiportal
 {
-       qer_trans 0.30
-       qer_nocarve
-       surfaceparm nodraw
-       surfaceparm nonsolid
-       surfaceparm structural
-       surfaceparm trans
-       surfaceparm antiportal
+    qer_trans 0.30
+    qer_nocarve
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm structural
+    surfaceparm trans
+    surfaceparm antiportal
 }
 
 textures/common/botclip
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm noimpact
-       surfaceparm botclip
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
+    surfaceparm botclip
 }
 
 textures/common/caulk
 {
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nomarks
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
 }
 
 textures/common/forcecaulk
 {
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm structural
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
+    surfaceparm structural
 }
 
 textures/common/clip
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm noimpact
-       surfaceparm playerclip
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
+    surfaceparm playerclip
 }
 
 textures/common/donotenter
 {
-       qer_trans 0.50
-       surfaceparm nodraw
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm donotenter
+    qer_trans 0.50
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm donotenter
 }
 
 textures/common/full_clip // silly shader, use weapclip instead
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm playerclip
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm playerclip
 }
 
 textures/common/hint // should NOT use surfaceparm hint.. strange but true
 {
-       qer_nocarve
-       qer_trans 0.30
-       surfaceparm nodraw
-       surfaceparm nonsolid
-       surfaceparm structural
-       surfaceparm trans
-       surfaceparm noimpact
-       surfaceparm hint        // ydnar: yes it should.
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm structural
+    surfaceparm trans
+    surfaceparm noimpact
+    surfaceparm hint    // ydnar: yes it should.
 }
 
 textures/common/hintskip
 {
-       qer_nocarve
-       qer_trans 0.30
-       surfaceparm nodraw
-       surfaceparm nonsolid
-       surfaceparm skip
-       surfaceparm structural
-       surfaceparm trans
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm skip
+    surfaceparm structural
+    surfaceparm trans
 }
 
 textures/common/invisible // solid, transparent polygons, casts shadows
 {
-       qer_editorimage textures/common/invisible.tga
-       surfaceparm nolightmap
-        {
-               map textures/common/invisible/invisible.tga
-               alphaFunc GE128
-               depthWrite
-               rgbGen vertex
-       }       
+    qer_editorimage textures/common/invisible.tga
+    surfaceparm nolightmap
+    {
+        map textures/common/invisible/invisible.tga
+        alphaFunc GE128
+        depthWrite
+        rgbGen vertex
+    }
 }
 
 textures/common/nodraw
 {
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/nodrawnonsolid
 {
-       surfaceparm nonsolid
-       surfaceparm nolightmap
-       surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm nolightmap
+    surfaceparm nodraw
 }
 
 textures/common/nodrop
 {
-       qer_nocarve
-       qer_trans 0.5
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm nodrop
+    qer_nocarve
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm nodrop
 }
 
 
 textures/common/noimpact
 {
-       qer_nocarve
-       qer_trans 0.5
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm trans
-       surfaceparm nomarks
-       surfaceparm noimpact
+    qer_nocarve
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm trans
+    surfaceparm nomarks
+    surfaceparm noimpact
 }
 
 textures/common/nolightmap
 {
-       surfaceparm nolightmap
+    surfaceparm nolightmap
 }
 
 textures/common/origin
 {
-       qer_nocarve
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm trans
-       surfaceparm origin
+    qer_nocarve
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm trans
+    surfaceparm origin
 }
 
 textures/common/skip
 {
-       qer_nocarve
-       qer_trans 0.30
-       surfaceparm nodraw
-       surfaceparm nonsolid
-       surfaceparm skip
-       surfaceparm structural
-       surfaceparm trans
+    qer_nocarve
+    qer_trans 0.30
+    surfaceparm nodraw
+    surfaceparm nonsolid
+    surfaceparm skip
+    surfaceparm structural
+    surfaceparm trans
 }
 
 textures/common/terrain
 {
-       q3map_terrain
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nomarks
+    q3map_terrain
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nomarks
 }
 
 textures/common/terrain2
 {
-       q3map_terrain
-       surfaceparm dust
-       surfaceparm nodraw
-       surfaceparm nomarks
-       surfaceparm nolightmap
+    q3map_terrain
+    surfaceparm dust
+    surfaceparm nodraw
+    surfaceparm nomarks
+    surfaceparm nolightmap
 }
 
 textures/common/trigger
 {
-       qer_trans 0.50
-       qer_nocarve
-       surfaceparm nodraw
+    qer_trans 0.50
+    qer_nocarve
+    surfaceparm nodraw
 }
 
 textures/common/weapclip
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm trans
-       surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 //
@@ -210,67 +210,100 @@ textures/common/weapclip
 
 textures/common/lightgrid
 {
-       qer_trans 0.5
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm nonsolid
-       surfaceparm detail
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm lightgrid
+    qer_trans 0.5
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm nonsolid
+    surfaceparm detail
+    surfaceparm nomarks
+    surfaceparm trans
+    surfaceparm lightgrid
 }
 
 textures/common/warpzone
 {
-       surfaceparm nolightmap
-       // surfaceparm nonsolid // no, it must be solid like trigger
-       surfaceparm trans
-       surfaceparm nomarks
-       {
-               map textures/common/warpzone/trans.tga // fully transparent
-               blendfunc blend
-       }
-       dp_camera
-       dp_refract 1 1 1 1 // makes the camera render like a refraction
+    surfaceparm nolightmap
+    // surfaceparm nonsolid // no, it must be solid like trigger
+    surfaceparm trans
+    surfaceparm nomarks
+    {
+        map textures/common/warpzone/trans.tga // fully transparent
+        blendfunc blend
+    }
+    dp_camera
+    dp_refract 1 1 1 1 // makes the camera render like a refraction
 }
 
 textures/common/camera
 {
-       surfaceparm nolightmap
-       surfaceparm trans
-       {
-               map textures/common/warpzone/trans.tga // fully transparent
-               blendfunc blend
-       }
-       dp_camera
+    surfaceparm nolightmap
+    surfaceparm trans
+    {
+        map textures/common/warpzone/trans.tga // fully transparent
+        blendfunc blend
+    }
+    dp_camera
 }
 
 textures/common/waternodraw
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm water
-       surfaceparm trans
-       surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm water
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/slimenodraw
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm slime
-       surfaceparm trans
-       surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm slime
+    surfaceparm trans
+    surfaceparm nomarks
 }
 
 textures/common/lavanodraw
 {
-       qer_trans 0.40
-       surfaceparm nodraw
-       surfaceparm nolightmap
-       surfaceparm lava
-       surfaceparm trans
-       surfaceparm nomarks
+    qer_trans 0.40
+    surfaceparm nodraw
+    surfaceparm nolightmap
+    surfaceparm lava
+    surfaceparm trans
+    surfaceparm nomarks
+}
+
+textures/common/base1
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base1
+        blendfunc filter
+    }
+}
+
+textures/common/base2
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base2
+        blendfunc filter
+    }
+}
+
+textures/common/base3
+{
+    {
+        map $lightmap
+    }
+    {
+        map textures/common/base3
+        blendfunc filter
+    }
 }

diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index 64c9d23c3e3460fc0a57230975b8456f34a82cc8..6b76821c3c8a06142ba933d48841e01cd8a19192 100644 (file)
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -96,13 +96,12 @@ textures/map_space-elevator/polluted_earth
        surfaceparm nolightmap
        surfaceparm nomarks
        q3map_globaltexture
-       q3map_surfacelight 20
+       q3map_surfacelight 5
        surfaceparm sky
 
         nopicmip
         nomipmaps
-
-       q3map_sunExt 1 0.9 0.9 250 320 20
-       q3map_skylight 05 4
+       q3map_sunExt 1 0.9 0.9 120 320 30
+       q3map_skylight 100 4
        skyparms env/polluted_earth/polluted_earth - -
 }

diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader
index 492d3d23e4175147c12b066db06481b230dcd55f..bf16eba4f08deeeb5b4bb68b941f7f31875d13c8 100644 (file)
--- a/scripts/map_warfare.shader
+++ b/scripts/map_warfare.shader
@@ -1,108 +1,112 @@
 textures/map_warfare/rocktosoil
 {
-       qer_editorimage textures/map_warfare/rocktosoil
-       
-       dpoffsetmapping - 2 match8 168
-       dpglossintensitymod 2
-       dpglossexponentmod 4
-       
-       q3map_bouncescale 0.75
-       q3map_lightmapsampleoffset 8
-       q3map_nonplanar
-       q3map_shadeangle 90
-       q3map_alphamod dotproduct2 ( 0 0 1 )
-       {
-               map textures/phillipk2x/natural/pk02_rock01
-       }
-       {
-               map textures/phillipk2x/natural/pk02_sand01
-               blendfunc blend
-               alphagen vertex
-       }
-       {
-               map $lightmap
-               blendfunc GL_DST_COLOR GL_ZERO
-       }
+    qer_editorimage textures/map_warfare/rocktosoil
+
+    dpoffsetmapping - 2 match8 168
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
+    q3map_alphamod dotproduct2 ( 0 0 1 )
+    {
+        map textures/phillipk2x/natural/pk02_rock01
+    }
+    {
+        map textures/phillipk2x/natural/pk02_sand01
+        blendfunc blend
+        alphagen vertex
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/env
 {
-       qer_editorimage textures/map_warfare/env.tga
-       qer_trans 0.5
-       
-       surfaceparm trans
-       
-       cull none
-       {
-               map textures/map_warfare/env.tga
-               blendfunc add
-               tcgen environment
-       }
+    qer_editorimage textures/map_warfare/env
+    qer_trans 0.5
+
+    surfaceparm trans
+    {
+        map textures/map_warfare/env
+        blendfunc add
+        tcgen environment
+    }
 }
 
 textures/map_warfare/floor_panel
 {
-       qer_editorimage textures/map_warfare/floor_panel
-       qer_alphafunc qequal 0.5
-    
+    qer_editorimage textures/map_warfare/floor_panel
+    qer_alphafunc qequal 0.5
+
     dpoffsetmapping - 2 match8 172
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       
-       surfaceparm metalsteps
-       surfaceparm trans
-       surfaceparm nonsolid
-       
-       q3map_bouncescale 0.75
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    surfaceparm metalsteps
+    surfaceparm trans
+    surfaceparm nonsolid
+
+    q3map_bouncescale 0.75
 
     polygonoffset
-       {
-               map textures/map_warfare/floor_panel
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               blendfunc filter
-       }
+    {
+        map textures/map_warfare/floor_panel
+        alphafunc GT0
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/sky
 {
-       qer_editorimage textures/skies/exosystem
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm nomarks
-       surfaceparm sky
-
-       q3map_sunext 1 1 1 350 60 42 3 16
-       q3map_lightmapfilterradius 0 8
-       q3map_skylight 400 4
-
-       skyparms env/exosystem/exosystem - -
+    qer_editorimage textures/skies/exosystem
+
+    surfaceparm noimpact
+    surfaceparm nolightmap
+    surfaceparm nodlight
+    surfaceparm nomarks
+    surfaceparm sky
+
+    q3map_sunext 1 1 1 350 60 42 3 16
+    q3map_lightmapfilterradius 0 8
+    q3map_skylight 400 4
+
+    skyparms env/exosystem/exosystem - -
 }
 
 textures/map_warfare/cactus
 {
-       qer_editorimage textures/map_warfare/cactus
-       qer_alphafunc qequal 0.5
-    
+    qer_editorimage textures/map_warfare/cactus
+    qer_alphafunc qequal 0.5
+
     dpoffsetmapping - 2 match8 68
-       dpglossintensitymod 2
-       dpglossexponentmod 4
-       
-       surfaceparm trans
-       surfaceparm nonsolid
-       
-       cull none
-       {
-               map textures/map_warfare/cactus
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               blendfunc filter
-       }
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    surfaceparm trans
+    surfaceparm alphashadow
+    surfaceparm nonsolid
+
+    cull none
+    {
+        map textures/map_warfare/cactus
+        alphafunc GT0
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 

diff --git a/textures/common/antiportal.tga b/textures/common/antiportal.tga
index 8a90743ac1aee63b51ff78ef4744ffbf3b30e43d..4182e4c304e8ba665338ea698189e2f6b2442183 100644 (file)
Binary files a/textures/common/antiportal.tga and b/textures/common/antiportal.tga differ

diff --git a/textures/common/base1.tga b/textures/common/base1.tga
new file mode 100644 (file)
index 0000000..1a5774f
Binary files /dev/null and b/textures/common/base1.tga differ

diff --git a/textures/common/base2.tga b/textures/common/base2.tga
new file mode 100644 (file)
index 0000000..12f128a
Binary files /dev/null and b/textures/common/base2.tga differ

diff --git a/textures/common/base3.tga b/textures/common/base3.tga
new file mode 100644 (file)
index 0000000..bb55b67
Binary files /dev/null and b/textures/common/base3.tga differ

diff --git a/textures/common/botclip.tga b/textures/common/botclip.tga
new file mode 100644 (file)
index 0000000..2063fed
Binary files /dev/null and b/textures/common/botclip.tga differ

diff --git a/textures/common/camera.tga b/textures/common/camera.tga
index 73077b304445fbfc7ef18dfbf7b02c39ee7233d4..77cd354ed9b4991b874e49856acf673aecfa6ccd 100644 (file)
Binary files a/textures/common/camera.tga and b/textures/common/camera.tga differ

diff --git a/textures/common/caulk.tga b/textures/common/caulk.tga
index 6293d3d423c5e2dcace7ac1eb726a49ad9d89078..e52126771d10234cec1f5d3affbcd68b8bfd3bbc 100644 (file)
Binary files a/textures/common/caulk.tga and b/textures/common/caulk.tga differ

diff --git a/textures/common/clip.tga b/textures/common/clip.tga
index 947cfce44fff064396d8326d66f88e1822cb3415..7d48eabadd74707017c248a4aaeb90807ec5fa80 100644 (file)
Binary files a/textures/common/clip.tga and b/textures/common/clip.tga differ

diff --git a/textures/common/donotenter.tga b/textures/common/donotenter.tga
index 8f3ddc4587c4620b5b288f1e3317d57e27946ea5..b4e48d4bf8e66967fa8716223e47d1ff09cae53a 100644 (file)
Binary files a/textures/common/donotenter.tga and b/textures/common/donotenter.tga differ

diff --git a/textures/common/forcecaulk.tga b/textures/common/forcecaulk.tga
index 50709f8d1ac40c8c331b6adeb64194e639a8e0c8..be05d2faea26c068651c05ac2b0dcd6b1d7e473e 100644 (file)
Binary files a/textures/common/forcecaulk.tga and b/textures/common/forcecaulk.tga differ

diff --git a/textures/common/full_clip.tga b/textures/common/full_clip.tga
index 22591e85aeaf9d3c5b3e561703750b1b628e13e9..5ba92713cdffc9dffaf0d586f86d0f882f2fa390 100644 (file)
Binary files a/textures/common/full_clip.tga and b/textures/common/full_clip.tga differ

diff --git a/textures/common/hint.tga b/textures/common/hint.tga
index ae760e1f93ecc401575a6a72fbe87ae8a66f6182..b0add453f0a534262f21ee82289d4ca0240e0777 100644 (file)
Binary files a/textures/common/hint.tga and b/textures/common/hint.tga differ

diff --git a/textures/common/hintskip.tga b/textures/common/hintskip.tga
index 03200c6b6a92a11ca7f0d6709d507c4668b92083..c149627afd97a43622d4961ca53ed7b9b640bc44 100644 (file)
Binary files a/textures/common/hintskip.tga and b/textures/common/hintskip.tga differ

diff --git a/textures/common/invisible.tga b/textures/common/invisible.tga
index 5e28f19942905f9e7bb51d4a9d9eeb44d221a510..a738d22f3375213a9e544aab85b9e0d170965983 100644 (file)
Binary files a/textures/common/invisible.tga and b/textures/common/invisible.tga differ

diff --git a/textures/common/lavanodraw.tga b/textures/common/lavanodraw.tga
index 07a9058209b41a3ccc6f541b36f8989ba342a7f0..dbbe694392aed325c601df09f22b1761d155bcb1 100644 (file)
Binary files a/textures/common/lavanodraw.tga and b/textures/common/lavanodraw.tga differ

diff --git a/textures/common/lightgrid.tga b/textures/common/lightgrid.tga
index 976216e5334d5d826e0d4584a5cd13d476353635..a5efb56f4fb4612310bc9cb374f8243793969f39 100644 (file)
Binary files a/textures/common/lightgrid.tga and b/textures/common/lightgrid.tga differ

diff --git a/textures/common/nodraw.tga b/textures/common/nodraw.tga
index c7393edfa2be40ffa2ea1431be8ae8fdb20039ed..e6a367e5969dde03be7fcacdfe2e8c1d5d58f58b 100644 (file)
Binary files a/textures/common/nodraw.tga and b/textures/common/nodraw.tga differ

diff --git a/textures/common/nodrawnonsolid.tga b/textures/common/nodrawnonsolid.tga
index 94e5493f1075fa3cedc8394724f3abb5a0f08032..fa6ff4eb0eadc07fe99f2ac003883d59afa93e14 100644 (file)
Binary files a/textures/common/nodrawnonsolid.tga and b/textures/common/nodrawnonsolid.tga differ

diff --git a/textures/common/nodrop.tga b/textures/common/nodrop.tga
index 2b202b661205d4324887337819cce41076f2012f..7ff915aec1758b57f8a2812006108a18050d5906 100644 (file)
Binary files a/textures/common/nodrop.tga and b/textures/common/nodrop.tga differ

diff --git a/textures/common/noimpact.tga b/textures/common/noimpact.tga
new file mode 100644 (file)
index 0000000..49ba1ba
Binary files /dev/null and b/textures/common/noimpact.tga differ

diff --git a/textures/common/nolightmap.tga b/textures/common/nolightmap.tga
index 4f4a59d551e8640b2bcccc2a8ebc0f18edd56494..939b39252ae93a12ca621bc9601c9047193ed5f4 100644 (file)
Binary files a/textures/common/nolightmap.tga and b/textures/common/nolightmap.tga differ

diff --git a/textures/common/origin.tga b/textures/common/origin.tga
index 2f544621da720550b6748a390f1e4cf99e1dbf41..0f1cecfd79ac2b6ab09761af8541fc432bbf4358 100644 (file)
Binary files a/textures/common/origin.tga and b/textures/common/origin.tga differ

diff --git a/textures/common/skip.tga b/textures/common/skip.tga
index 703a39ff0c1f3db5263f3d6777e2a3d25cad5e3d..3d6b25cafa2a9d24fbc6c8c4064c73aed2dede91 100644 (file)
Binary files a/textures/common/skip.tga and b/textures/common/skip.tga differ

diff --git a/textures/common/slimenodraw.tga b/textures/common/slimenodraw.tga
index b2e819c8a9fc35054290e306202f6423642d4d29..23a2eac1e2b3e2f08ba47c129161a25952e87617 100644 (file)
Binary files a/textures/common/slimenodraw.tga and b/textures/common/slimenodraw.tga differ

diff --git a/textures/common/terrain.tga b/textures/common/terrain.tga
index 16a2482885b7ac040eeb4c4f7203b0f95e889aee..655261d559169d8a6678fc21f0bf8896f3ec8a2e 100644 (file)
Binary files a/textures/common/terrain.tga and b/textures/common/terrain.tga differ

diff --git a/textures/common/terrain2.tga b/textures/common/terrain2.tga
index 16a2482885b7ac040eeb4c4f7203b0f95e889aee..a13433a1e9add15fa88cf5f914d9bee42534bd35 100644 (file)
Binary files a/textures/common/terrain2.tga and b/textures/common/terrain2.tga differ

diff --git a/textures/common/trigger.tga b/textures/common/trigger.tga
index 1879a5eb0337ec4627d3464e9dcb758e2024328d..03dbcf2933422d9a5c0bdfa2ad0a80891e3c7b62 100644 (file)
Binary files a/textures/common/trigger.tga and b/textures/common/trigger.tga differ

diff --git a/textures/common/warpzone.tga b/textures/common/warpzone.tga
index 8ec7774fa6eb5c68b3be4cc84ec2a06309cd4b4d..1743ddc0672ce80e690823496f0096f6ea51f46e 100644 (file)
Binary files a/textures/common/warpzone.tga and b/textures/common/warpzone.tga differ

diff --git a/textures/common/waternodraw.tga b/textures/common/waternodraw.tga
index d068ff610a482fb9acf0aa4e6b20cf2c10829436..0b6d574acd739a00a71394783b0e06aa5df6f8e3 100644 (file)
Binary files a/textures/common/waternodraw.tga and b/textures/common/waternodraw.tga differ

diff --git a/textures/common/weapclip.tga b/textures/common/weapclip.tga
index 97579e570f7224fa2e855ec2e19ac9030feedeef..3f70ce8c5d8c4c95913995307c37b8eda4aa4faf 100644 (file)
Binary files a/textures/common/weapclip.tga and b/textures/common/weapclip.tga differ