overhaul of the common textures with a uniform design and font, added base shaders...

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/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/nolightmap.tga b/textures/common/nolightmap.tga
index 4f4a59d551e8640b2bcccc2a8ebc0f18edd56494..d0cf5065c889c13574ee4d2fd314cbeb3b8aeeca 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