r2687 - branches/nexuiz-2.0/data/scripts

[savagex at icculus.org]

Author: savagex
Date: 2007-05-24 08:57:32 -0400 (Thu, 24 May 2007)
New Revision: 2687

Modified:
   branches/nexuiz-2.0/data/scripts/dsi.shader
   branches/nexuiz-2.0/data/scripts/sav-liquids.shader
   branches/nexuiz-2.0/data/scripts/savdm6ish.shader
Log:
merge q3 shader changes to branch


Modified: branches/nexuiz-2.0/data/scripts/dsi.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/dsi.shader	2007-05-24 11:49:41 UTC (rev 2686)
+++ branches/nexuiz-2.0/data/scripts/dsi.shader	2007-05-24 12:57:32 UTC (rev 2687)
@@ -67,7 +67,8 @@
 	{
 		map textures/dsi/dsiglass2.tga
 		blendfunc blend
-		rgbGen vertex
+		rgbGen vertex
+		tcgen environment
 	}	
 }
 

Modified: branches/nexuiz-2.0/data/scripts/sav-liquids.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/sav-liquids.shader	2007-05-24 11:49:41 UTC (rev 2686)
+++ branches/nexuiz-2.0/data/scripts/sav-liquids.shader	2007-05-24 12:57:32 UTC (rev 2687)
@@ -10,7 +10,7 @@
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 250
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -31,6 +31,7 @@
 	{
 		map textures/dsi/dsiglass2.tga
 		blendfunc blend
-		rgbGen vertex
+		rgbGen vertex
+		tcgen environment
 	}	
 }

Modified: branches/nexuiz-2.0/data/scripts/savdm6ish.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/savdm6ish.shader	2007-05-24 11:49:41 UTC (rev 2686)
+++ branches/nexuiz-2.0/data/scripts/savdm6ish.shader	2007-05-24 12:57:32 UTC (rev 2687)
@@ -11,6 +11,7 @@
 	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#lava1.jpg
+		tcMod turb 0 0.2 0 0.04
 	}
 }
 
@@ -27,6 +28,7 @@
 	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#teleport.jpg
+		tcMod turb 0 0.2 0 0.04
 	}
 }