r2741 - in trunk: misc pro

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-30 09:34:19 -0400 (Wed, 30 May 2007)
New Revision: 2741

Modified:
   trunk/misc/makebuild.sh
   trunk/pro/default.cfg
Log:
Pro: make r_ambient a seta; add culling settings


Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2007-05-30 11:36:33 UTC (rev 2740)
+++ trunk/misc/makebuild.sh	2007-05-30 13:34:19 UTC (rev 2741)
@@ -17,9 +17,20 @@
 : ${versiontag:=}
 echo "date stamp: $date"
 
-version=2-svntest-$date
-versiontag=test
-defaultcfg=""
+case "$version" in
+	'')
+		version=2-svntest-$date
+		versiontag=test
+		defaultcfg=
+		ext=
+		;;
+	*)
+		version=$version
+		versiontag=$versiontag
+		defaultcfg=
+		ext=_$version
+		;;
+esac
 
 basepk3=$base/data20060905.pk3
 nexdir=$base/nexuiz
@@ -46,7 +57,7 @@
 		i=`echo "$i" | tr a-y b-z`
 	fi
 done
-date=$date$i
+ext=$i$ext
 
 echo "Using build name nexuiz$date$ext"
 sleep 3
@@ -181,7 +192,7 @@
 
 cd "$tmpdir/data"
 mv common-spog.pk3 ..
-perl -pi -e '/^set g_nexuizversion "([0-9.]*)[^"]*"/ and $_ = "set g_nexuizversion \"'$version'\"\n"' default.cfg
+perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version'\n"' default.cfg
 if [ -n "$versiontag" ]; then
 	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
 	cp "$buildfiles/brand/$versiontag.tga" gfx/brand.tga
@@ -191,7 +202,7 @@
 7za a -mx=7 -tzip ../data.pk3 .
 
 cd "$tmpdir/pro"
-perl -pi -e '/^set g_nexuizversion "([0-9.]*)[^"]*"/ and $_ = "set g_nexuizversion \"'$version-pro'\"\n"' default.cfg
+perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version-pro'\n"' default.cfg
 if [ -n "$versiontag" ]; then
 	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
 fi

Modified: trunk/pro/default.cfg
===================================================================
--- trunk/pro/default.cfg	2007-05-30 11:36:33 UTC (rev 2740)
+++ trunk/pro/default.cfg	2007-05-30 13:34:19 UTC (rev 2741)
@@ -106,6 +106,10 @@
 set sv_mapchange_delay 5
 set minplayers 0
 sv_cullentities_trace 1
+sv_cullentities_trace_samples 4
+sv_cullentities_trace_samples_extra 8
+r_cullentities_trace 1
+r_cullentities_trace_samples 4
 
 // restart server if all players hit "ready"-button
 set sv_ready_restart 0
@@ -435,7 +439,7 @@
 r_mipsprites 1
 r_mipskins 1
 r_shadow_realtime_world_lightmaps 1
-r_ambient 20
+seta r_ambient 20
 cl_decals_fadetime 1
 cl_decals_time 2
 seta cl_nogibs 0