From: cbrutail Date: Mon, 3 Oct 2011 22:15:17 +0000 (+0200) Subject: Merge branch 'master' into cbrutail/map-lightspeed X-Git-Tag: xonotic-v0.6.0~76 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5625abded13bf4902f027931d831bfc79a9d372b;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into cbrutail/map-lightspeed Conflicts: scripts/liquids_water.shader I hope I don't fuck up my branch --- 5625abded13bf4902f027931d831bfc79a9d372b diff --cc scripts/liquids_water.shader index de2c37f9,baf700f0..00000000 deleted file mode 100644,100644 --- a/scripts/liquids_water.shader +++ /dev/null @@@ -1,99 -1,101 +1,0 @@@ --// reflective water by Urre and Zombie -- --textures/liquids_water/water0 --{ -- qer_editorimage textures/liquids_water/water0.tga -- qer_trans 20 -- surfaceparm nomarks -- surfaceparm trans -- surfaceparm water -- surfaceparm nolightmap -- cull none -- q3map_globaltexture -- { -- map textures/liquids_water/water0.tga -- tcMod scroll 0.07 0.07 -- tcmod scale 1.2 0.7 -- blendfunc blend -- } -- dp_water 0.1 0.25 3 3 1 1 1 1 1 1 0.125 --} -- --textures/liquids_water/water0_cubemap --{ -- qer_trans 20 -- surfaceparm nomarks -- surfaceparm trans -- surfaceparm water -- surfaceparm nolightmap -- cull none -- q3map_globaltexture - qer_editorimage textures/liquids_water/water0_reflect.tga - tessSize 256 - qer_editorimage textures/liquids_water/water0c_reflect.tga -- { - map textures/liquids_water/water0.tga - map textures/liquids_water/water0c.tga -- tcMod turb 0 0.4 0 0.08 -- blendfunc add -- } -- dpreflectcube cubemaps/default/sky -- { -- map $lightmap -- blendfunc add -- tcGen lightmap -- } - dp_water 0.1 0.9 3 3 1 1 1 1 1 1 0.4 --} -- --textures/liquids_water/water1 --{ -- qer_editorimage textures/liquids_water/water1.tga -- qer_trans 20 -- surfaceparm nomarks -- surfaceparm trans -- surfaceparm water -- surfaceparm nolightmap -- cull none -- q3map_globaltexture -- { -- map textures/liquids_water/water1.tga -- tcMod scroll 0.07 0.07 -- tcmod scale 1.2 0.7 -- blendfunc blend -- } -- dp_water 0.1 0.25 3 3 1 1 1 1 1 1 0.125 --} -- --textures/liquids_water/water2 --{ -- qer_editorimage textures/liquids_water/water2.tga -- qer_trans 20 -- surfaceparm nomarks -- surfaceparm trans -- surfaceparm water -- surfaceparm nolightmap -- cull none -- q3map_globaltexture -- { -- map textures/liquids_water/water2.tga -- tcMod scroll 0.07 0.07 -- tcmod scale 1.2 0.7 -- blendfunc blend -- } -- dp_water 0.1 0.25 3 3 1 1 1 1 1 1 0.125 --} -- --textures/liquids_water/ruiner_water --{ -- qer_editorimage textures/liquids_water/ruiner_water.jpg -- qer_trans 0.5 -- surfaceparm noimpact -- surfaceparm trans -- surfaceparm nonsolid -- surfaceparm water -- deformVertexes wave 150.0 sin 2 5 0.25 0.1 -- Q3map_TessSize 128 -- cull none -- { -- map textures/liquids_water/ruiner_water.jpg -- blendFunc add -- rgbGen identity -- } --}