Merge branch 'origin/master' (early part) into fruitiex/warpzone

diff --git a/models/warpzone/warpzone-blueedge.md3 b/models/warpzone/warpzone-blueedge.md3
new file mode 100644 (file)
index 0000000..b0daad1
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 (file)
index 0000000..d6f6c1b
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 (file)
index 0000000..81761ec
--- /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 (file)
index 0000000..fd290ae
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 (file)
index 0000000..ce0dc6f
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 (file)
index 0000000..1a6dcdd
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 (file)
index 0000000..86e9802
Binary files /dev/null and b/textures/warpzone/warpzone-wavy_norm.tga differ