From: Rudolf Polzer Date: Wed, 21 Jul 2010 10:16:06 +0000 (+0200) Subject: Merge remote branch 'origin/master' into fruitiex/warpzone X-Git-Tag: xonotic-v0.1.0preview~151^2~32^2~1 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=6ae2ac1af2cb9c2f22e45381f81ee8982a315a50;hp=53ec6ce82588fa3afab1f6ce8dd70b8da95e7c32 Merge remote branch 'origin/master' into fruitiex/warpzone --- diff --git a/models/warpzone/warpzone-blueedge.md3 b/models/warpzone/warpzone-blueedge.md3 new file mode 100644 index 00000000..b0daad14 Binary files /dev/null and b/models/warpzone/warpzone-blueedge.md3 differ diff --git a/models/warpzone/warpzone-rededge.md3 b/models/warpzone/warpzone-rededge.md3 new file mode 100644 index 00000000..d6f6c1bc Binary files /dev/null and b/models/warpzone/warpzone-rededge.md3 differ diff --git a/scripts/warpzone.shader b/scripts/warpzone.shader new file mode 100644 index 00000000..81761ec1 --- /dev/null +++ b/scripts/warpzone.shader @@ -0,0 +1,38 @@ +textures/warpzone/warpzone-wavy +{ + surfaceparm nolightmap + // surfaceparm nonsolid // no, it must be solid like trigger + surfaceparm trans + surfaceparm nomarks + { + map textures/warpzone/warpzone-wavy.tga + tcMod scroll 0.06 0.06 + blendfunc blend + } + dp_camera + dp_refract 1 1 1 1 // makes the camera render like a refraction +} + +textures/warpzone/warpzone-blueedge +{ + surfaceparm nonsolid + surfaceparm nomarks + q3map_surfacelight 2500 + cull none + { + map textures/warpzone/warpzone-blueedge.tga + blendfunc add + } +} + +textures/warpzone/warpzone-rededge +{ + surfaceparm nonsolid + surfaceparm nomarks + q3map_surfacelight 2500 + cull none + { + map textures/warpzone/warpzone-rededge.tga + blendfunc add + } +} diff --git a/textures/warpzone/warpzone-blueedge.tga b/textures/warpzone/warpzone-blueedge.tga new file mode 100644 index 00000000..fd290ae5 Binary files /dev/null and b/textures/warpzone/warpzone-blueedge.tga differ diff --git a/textures/warpzone/warpzone-rededge.tga b/textures/warpzone/warpzone-rededge.tga new file mode 100644 index 00000000..ce0dc6fc Binary files /dev/null and b/textures/warpzone/warpzone-rededge.tga differ diff --git a/textures/warpzone/warpzone-wavy.tga b/textures/warpzone/warpzone-wavy.tga new file mode 100644 index 00000000..1a6dcdde Binary files /dev/null and b/textures/warpzone/warpzone-wavy.tga differ diff --git a/textures/warpzone/warpzone-wavy_norm.tga b/textures/warpzone/warpzone-wavy_norm.tga new file mode 100644 index 00000000..86e98022 Binary files /dev/null and b/textures/warpzone/warpzone-wavy_norm.tga differ