r1937 - in trunk: data data/scripts misc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-11-25 15:26:59 -0500 (Sat, 25 Nov 2006)
New Revision: 1937

Modified:
   trunk/data/default.cfg
   trunk/data/scripts/evil4_techtrims.shader
   trunk/data/scripts/savdm6ish.shader
   trunk/misc/makebuild.sh
Log:
Version := 2.2svn
shader syntax fixes


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2006-11-25 20:24:27 UTC (rev 1936)
+++ trunk/data/default.cfg	2006-11-25 20:26:59 UTC (rev 1937)
@@ -1,5 +1,5 @@
 // Nexuiz version (formatted for humans)
-set g_nexuizversion "2.0"
+set g_nexuizversion "2.2svn"
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible

Modified: trunk/data/scripts/evil4_techtrims.shader
===================================================================
--- trunk/data/scripts/evil4_techtrims.shader	2006-11-25 20:24:27 UTC (rev 1936)
+++ trunk/data/scripts/evil4_techtrims.shader	2006-11-25 20:26:59 UTC (rev 1937)
@@ -1178,7 +1178,7 @@
 textures/evil4_d_techwalls/d_tech_drkwll_pnltek
 {
 	{
-		maptextures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga
+		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga
 		tcmod turb 0 1 1 9
 		blendFunc GL_ONE GL_ONE
 	}

Modified: trunk/data/scripts/savdm6ish.shader
===================================================================
--- trunk/data/scripts/savdm6ish.shader	2006-11-25 20:24:27 UTC (rev 1936)
+++ trunk/data/scripts/savdm6ish.shader	2006-11-25 20:26:59 UTC (rev 1937)
@@ -1,14 +1,14 @@
 textures/savdm6ish/#lava1
 {
 	qer_editorimage textures/savdm6ish/#lava1.jpg
-	#qer_nocarve
+	//qer_nocarve
 	surfaceparm noimpact
 	surfaceparm lava
 	surfaceparm nolightmap
 	q3map_surfacelight 3000
 	cull disable
-	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02
+	//tessSize 256
+	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#lava1.jpg
 	}
@@ -23,8 +23,8 @@
 	surfaceparm nolightmap
 	q3map_surfacelight 1000
 	cull disable
-	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02
+	//tessSize 256
+	//deformVertexes wave 100sin 5 5 .5 0.02
 	{
 		map textures/savdm6ish/#teleport.jpg
 	}
@@ -64,4 +64,4 @@
 		map $lightmap
 		blendfunc filter
 	}
-}
\ No newline at end of file
+}

Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2006-11-25 20:24:27 UTC (rev 1936)
+++ trunk/misc/makebuild.sh	2006-11-25 20:26:59 UTC (rev 1937)
@@ -3,7 +3,7 @@
 
 base=`pwd`
 
-basepk3=$base/data20060614.pk3
+basepk3=$base/data20060905.pk3
 nexdir=$base/nexuiz
 dpdir=$base/darkplaces
 tmpdir=/tmp/NEX
@@ -14,7 +14,7 @@
 copystrip=$buildfiles/copystrip
 fteqcc="fteqcc.bin -O2"
 mingw=/home/polzer/mingw32
-ia32=/chroot/fc4-i386
+ia32=/chroot/fc5-i386
 osxhost=macmini_osx
 osxtemp=/Users/rpolzer/Darkplaces.build