r2579 - in trunk/data: scripts textures textures/morphed textures/stralenex1

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu May 17 13:11:11 EDT 2007


Author: strahlemann
Date: 2007-05-17 13:11:11 -0400 (Thu, 17 May 2007)
New Revision: 2579

Added:
   trunk/data/scripts/morphed.shader
   trunk/data/textures/morphed/
   trunk/data/textures/morphed/gelslime.tga
   trunk/data/textures/morphed/gelslime_bright.jpg
   trunk/data/textures/morphed/gelslime_gloss.tga
   trunk/data/textures/morphed/gelslime_glow.jpg
   trunk/data/textures/morphed/gelslime_norm.tga
   trunk/data/textures/morphed/gelslime_original.tga
   trunk/data/textures/stralenex1/slime_rev-1.jpg
   trunk/data/textures/stralenex1/slime_rev-1_glow.jpg
   trunk/data/textures/stralenex1/slime_rev-2.jpg
   trunk/data/textures/stralenex1/slime_rev-2_glow.jpg
   trunk/data/textures/stralenex1/slime_rev-3.jpg
   trunk/data/textures/stralenex1/slime_rev-3_glow.jpg
   trunk/data/textures/stralenex1/slime_rev.jpg
   trunk/data/textures/stralenex1/slime_rev_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-1.jpg
   trunk/data/textures/stralenex1/slimepit_ad-10.jpg
   trunk/data/textures/stralenex1/slimepit_ad-10_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-11.jpg
   trunk/data/textures/stralenex1/slimepit_ad-11_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-1_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-2.jpg
   trunk/data/textures/stralenex1/slimepit_ad-2_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-3.jpg
   trunk/data/textures/stralenex1/slimepit_ad-3_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-4.jpg
   trunk/data/textures/stralenex1/slimepit_ad-4_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-5.jpg
   trunk/data/textures/stralenex1/slimepit_ad-5_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-6.jpg
   trunk/data/textures/stralenex1/slimepit_ad-6_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-7.jpg
   trunk/data/textures/stralenex1/slimepit_ad-7_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-8.jpg
   trunk/data/textures/stralenex1/slimepit_ad-8_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad-9.jpg
   trunk/data/textures/stralenex1/slimepit_ad-9_glow.jpg
   trunk/data/textures/stralenex1/slimepit_ad.jpg
   trunk/data/textures/stralenex1/slimepit_ad_glow.jpg
Modified:
   trunk/data/scripts/shaderlist.txt
   trunk/data/scripts/stralenex1.shader
Log:
Added new slime and some fancy blinking stuff for slimepit revisited

Added: trunk/data/scripts/morphed.shader
===================================================================
--- trunk/data/scripts/morphed.shader	                        (rev 0)
+++ trunk/data/scripts/morphed.shader	2007-05-17 17:11:11 UTC (rev 2579)
@@ -0,0 +1,66 @@
+textures/morphed/slimem
+{
+	qer_editorimage textures/morphed/slimem.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 250
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/slimem.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+textures/morphed/gelslime
+{
+	qer_editorimage textures/morphed/gelslime.tga
+	q3map_lightimage textures/morphed/gelslime_glow.tga
+	qer_trans 0.75
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 280
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime.tga
+		rgbGen identity
+		depthWrite
+		blendfunc blend
+	}
+	{
+		map $lightmap
+		blendfunc blend
+		rgbGen identity
+		tcGen lightmap
+		depthFunc equal
+	}
+}
+
+textures/morphed/gelslime_bright
+{
+	qer_editorimage textures/morphed/gelslime_bright.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 300
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime_bright.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+

Modified: trunk/data/scripts/shaderlist.txt
===================================================================
--- trunk/data/scripts/shaderlist.txt	2007-05-17 16:17:42 UTC (rev 2578)
+++ trunk/data/scripts/shaderlist.txt	2007-05-17 17:11:11 UTC (rev 2579)
@@ -1,30 +1,34 @@
-blacksky
-common
-dsi
-e7
-el3dm1
-evil3
-evil4_techtrims
-evil5
-evil6
-evil6_floors
-evil6_lights
-evil6_support
-evil6_trims
-evil6_walls
-evil8_base
-eX
-harlequin_sky
-kaznexctf2
-liquids
-nexdm18_rmx
-official_cmp1
-reaper
-savdm6ish
-sav-graysky1
-sav-liquids
-stralenex1
-stralenex8
-swamp
-toxic
-tznex01
+blacksky
+common
+dsi
+e7
+el3dm1
+evil2
+evil3
+evil4_techtrims
+evil5
+evil6
+evil6_floors
+evil6_lights
+evil6_support
+evil6_trims
+evil6_walls
+evil8_base
+eX
+final_rage
+harlequin_sky
+kaznexctf2
+liquids
+morphed
+nexdm18_rmx
+official_cmp1
+reaper
+savdm6ish
+sav-graysky1
+sav-liquids
+stralenex1
+stralenex8
+swamp
+toxic
+tznex01
+test

Modified: trunk/data/scripts/stralenex1.shader
===================================================================
--- trunk/data/scripts/stralenex1.shader	2007-05-17 16:17:42 UTC (rev 2578)
+++ trunk/data/scripts/stralenex1.shader	2007-05-17 17:11:11 UTC (rev 2579)
@@ -69,7 +69,7 @@
 		//rgbGen identity 
 
         
-	}
+	}
 	{
 		map $lightmap
 		rgbGen identity
@@ -132,8 +132,7 @@
 		map textures/stralenex1/e6xrst_supprt.tga
 		rgbGen identity
 		depthWrite
-		//alphaFunc GE128
-		blendfunc blend
+		alphaFunc GE128
 	}
 	{
 		map $lightmap 
@@ -209,8 +208,8 @@
 	q3map_sun .627 .525 0.392 60 300 40
 	/*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
 
-}
-
+}
+
 textures/stralenex1/stralenex5_1
 {
 	qer_editorimage env/stralenex5/stralenex5_up.tga
@@ -226,8 +225,8 @@
 	q3map_sun .627 .525 0.392 450 60 13
 	/*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
 
-}
-
+}
+
 textures/stralenex1/stralenex5_2
 {
 	qer_editorimage env/stralenex5/stralenex5_up.tga
@@ -327,3 +326,43 @@
 		rgbGen identityLighting
 	}
 }
+
+textures/stralenex1/slimepit_ad-1
+{
+	qer_editorimage textures/stralenex1/slimepit_ad.tga
+	q3map_lightimage textures/stralenex1/slimepit_ad_glow.tga
+	surfaceparm nomarks
+	q3map_surfacelight 400
+	
+	{
+		map textures/stralenex1/slimepit_ad-1.tga
+		animmap 1 textures/stralenex1/slimepit_ad textures/stralenex1/slimepit_ad textures/stralenex1/slimepit_ad-1 textures/stralenex1/slimepit_ad-1 textures/stralenex1/slimepit_ad-2 textures/stralenex1/slimepit_ad-2 textures/stralenex1/slimepit_ad-3 textures/stralenex1/slimepit_ad-3 textures/stralenex1/slimepit_ad-4 textures/stralenex1/slimepit_ad-4 textures/stralenex1/slimepit_ad-5 textures/stralenex1/slimepit_ad-5 textures/stralenex1/slimepit_ad-6 textures/stralenex1/slimepit_ad-6 textures/stralenex1/slimepit_ad-7 textures/stralenex1/slimepit_ad-7 textures/stralenex1/slimepit_ad-8 textures/stralenex1/slimepit_ad-8 textures/stralenex1/slimepit_ad-9 textures/stralenex1/slimepit_ad-9 textures/stralenex1/slimepit_ad-10 textures/stralenex1/slimepit_ad-11 textures/stralenex1/slimepit_ad-10 textures/stralenex1/slimepit_ad-11 textures/stralenex1/slimepit_ad-10 textures/stralenex1/slimepit_ad-11 
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+
+}
+
+textures/stralenex1/slime_rev
+{
+	qer_editorimage textures/stralenex1/slime_rev.tga
+	q3map_lightimage textures/stralenex1/slime_rev_glow.tga
+	surfaceparm nomarks
+	q3map_surfacelight 400
+	
+	{
+		map textures/stralenex1/slime_rev.tga
+		animmap 1 textures/stralenex1/slime_rev textures/stralenex1/slime_rev textures/stralenex1/slime_rev-1 textures/stralenex1/slime_rev-1 textures/stralenex1/slime_rev-2 textures/stralenex1/slime_rev-2 textures/stralenex1/slime_rev-3 textures/stralenex1/slime_rev-3
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+
+}
\ No newline at end of file

Added: trunk/data/textures/morphed/gelslime.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/morphed/gelslime_bright.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime_bright.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/morphed/gelslime_gloss.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime_gloss.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/morphed/gelslime_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/morphed/gelslime_norm.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime_norm.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/morphed/gelslime_original.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/morphed/gelslime_original.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-1.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-1.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-1_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-1_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-2.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-2.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-2_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-2_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-3.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-3.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev-3_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev-3_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slime_rev_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slime_rev_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-1.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-1.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-10.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-10.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-10_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-10_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-11.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-11.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-11_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-11_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-1_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-1_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-2.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-2.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-2_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-2_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-3.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-3.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-3_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-3_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-4.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-4.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-4_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-4_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-5.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-5.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-5_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-5_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-6.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-6.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-6_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-6_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-7.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-7.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-7_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-7_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-8.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-8.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-8_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-8_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-9.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-9.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad-9_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad-9_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/textures/stralenex1/slimepit_ad_glow.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/data/textures/stralenex1/slimepit_ad_glow.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the nexuiz-commits mailing list