From: mschwan Date: Tue, 15 Sep 2015 16:46:41 +0000 (+0200) Subject: overhaul of the common textures with a uniform design and font, added base shaders... X-Git-Tag: xonotic-v0.8.2~161^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=579d47060e9a32d8acb8ab85f874b565015b617e;p=xonotic%2Fxonotic-maps.pk3dir.git overhaul of the common textures with a uniform design and font, added base shaders for blocking out maps --- diff --git a/scripts/common.shader b/scripts/common.shader index 466e522c..68c77762 100644 --- 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 8a90743a..4182e4c3 100644 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 index 00000000..1a5774f9 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 index 00000000..12f128a6 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 index 00000000..bb55b67a 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 index 00000000..2063feda Binary files /dev/null and b/textures/common/botclip.tga differ diff --git a/textures/common/camera.tga b/textures/common/camera.tga index 73077b30..77cd354e 100644 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 6293d3d4..e5212677 100644 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 947cfce4..7d48eaba 100644 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 8f3ddc45..b4e48d4b 100644 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 50709f8d..be05d2fa 100644 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 22591e85..5ba92713 100644 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 ae760e1f..b0add453 100644 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 03200c6b..c149627a 100644 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 5e28f199..a738d22f 100644 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 07a90582..dbbe6943 100644 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 976216e5..a5efb56f 100644 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 c7393edf..e6a367e5 100644 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 94e5493f..fa6ff4eb 100644 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 2b202b66..7ff915ae 100644 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 4f4a59d5..d0cf5065 100644 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 2f544621..0f1cecfd 100644 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 703a39ff..3d6b25ca 100644 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 b2e819c8..23a2eac1 100644 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 16a24828..655261d5 100644 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 16a24828..a13433a1 100644 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 1879a5eb..03dbcf29 100644 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 8ec7774f..1743ddc0 100644 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 d068ff61..0b6d574a 100644 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 97579e57..3f70ce8c 100644 Binary files a/textures/common/weapclip.tga and b/textures/common/weapclip.tga differ