From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 2 Sep 2010 10:30:19 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~53
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=53277300e7356ea6265e48a087cd2a234c962a14;hp=7247fd01642ccf7c60a32053b1b9673441ba2833

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

diff --git a/all b/all
index f22a8b72..fb15fb02 100755
--- a/all
+++ b/all
@@ -550,18 +550,11 @@ case "$cmd" in
 				cleanqc=true
 				shift
 				;;
-			-n)
-				cleand0=false
-				cleandp=false
-				cleanqcc=false
-				cleanqc=false
-				shift
-				;;
 			*)
 				cleand0=false
 				cleandp=false
 				cleanqcc=false
-				cleanqc=true # version info
+				cleanqc=false
 				;;
 		esac
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -1052,7 +1045,7 @@ case "$cmd" in
 		verbose "$SELF" release-compile osx \
 			'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
 			'' '' \
-			'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
 		;;
 	release-engine-osx)
 		verbose "$SELF" release-engine-osx-sv-sdl
diff --git a/misc/logos/icons_ico/xonotic.ico b/misc/logos/icons_ico/xonotic.ico
new file mode 100644
index 00000000..c6f1714e
Binary files /dev/null and b/misc/logos/icons_ico/xonotic.ico differ
diff --git a/misc/logos/icons_ico/xonotic_128.ico b/misc/logos/icons_ico/xonotic_128.ico
deleted file mode 100644
index c5889032..00000000
Binary files a/misc/logos/icons_ico/xonotic_128.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_16.ico b/misc/logos/icons_ico/xonotic_16.ico
deleted file mode 100644
index e6047f9c..00000000
Binary files a/misc/logos/icons_ico/xonotic_16.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_22.ico b/misc/logos/icons_ico/xonotic_22.ico
deleted file mode 100644
index 0b8208ea..00000000
Binary files a/misc/logos/icons_ico/xonotic_22.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_24.ico b/misc/logos/icons_ico/xonotic_24.ico
deleted file mode 100644
index 6dc45574..00000000
Binary files a/misc/logos/icons_ico/xonotic_24.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_256.ico b/misc/logos/icons_ico/xonotic_256.ico
deleted file mode 100644
index 8ee2236d..00000000
Binary files a/misc/logos/icons_ico/xonotic_256.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_32.ico b/misc/logos/icons_ico/xonotic_32.ico
deleted file mode 100644
index b470163c..00000000
Binary files a/misc/logos/icons_ico/xonotic_32.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_48.ico b/misc/logos/icons_ico/xonotic_48.ico
deleted file mode 100644
index 7cf932a8..00000000
Binary files a/misc/logos/icons_ico/xonotic_48.ico and /dev/null differ
diff --git a/misc/logos/icons_ico/xonotic_64.ico b/misc/logos/icons_ico/xonotic_64.ico
deleted file mode 100644
index a1d99e89..00000000
Binary files a/misc/logos/icons_ico/xonotic_64.ico and /dev/null differ
diff --git a/misc/tools/fft-normalmap-to-heightmap.c b/misc/tools/fft-normalmap-to-heightmap.c
index aa4ac7ff..8d95d5c6 100644
--- a/misc/tools/fft-normalmap-to-heightmap.c
+++ b/misc/tools/fft-normalmap-to-heightmap.c
@@ -270,6 +270,8 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale)
 		imgspace1[(w*y+x)][0] = (v - 128.0) / 127.0;
 		imgspace1[(w*y+x)][1] = 0;
 #endif
+		if(v < 1)
+			v = 1; /* do not write alpha zero */
 		map[(w*y+x)*4+3] = floor(v + 0.5);
 	}
 
@@ -354,11 +356,11 @@ void hmap_to_nmap_local(unsigned char *map, int w, int h, int src_chan, double s
 	int i, j;
 	double *img_reduced = malloc(w*h * sizeof(double));
 	static const double filter[3][3] = { /* filter to derive one component */
-		{ -1, 0, 1 },
-		{ -2, 0, 2 },
-		{ -1, 0, 1 }
+		{  -3, 0,  3 },
+		{ -10, 0, 10 },
+		{  -3, 0,  3 }
 	};
-	static const double filter_mult = 0.125;
+	static const double filter_mult = 0.03125;
 
 	for(y = 0; y < h; ++y)
 	for(x = 0; x < w; ++x)
@@ -380,6 +382,8 @@ void hmap_to_nmap_local(unsigned char *map, int w, int h, int src_chan, double s
 				break;
 		}
 		img_reduced[(w*y+x)] = (v - 128.0) / 127.0;
+		if(v < 1)
+			v = 1; /* do not write alpha zero */
 		map[(w*y+x)*4+3] = floor(v + 0.5);
 	}
 
diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 58e1e75f..162f3c8c 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -19,13 +19,13 @@ use File::Temp;
 	our $Q3MAP2FLAGS = '-fs_forbiddenpath xonotic-data.pk3 -fs_forbiddenpath xonotic-data.pk3dir -fs_forbiddenpath xonotic-nexcompat.pk3 -fs_forbiddenpath xonotic-nexcompat.pk3dir';
 
 	# Default flags for the -bsp stage
-	our $BSPFLAGS    = '-meta -samplesize 8 -minsamplesize 4 -mv 1000000 -mi 6000000';
+	our $BSPFLAGS    = '-meta -maxarea -samplesize 8 -minsamplesize 4 -mv 1000000 -mi 6000000';
 
 	# Default flags for the -vis stage
 	our $VISFLAGS    = '';
 
 	# Default flags for the -light stage
-	our $LIGHTFLAGS  = '-deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
+	our $LIGHTFLAGS  = '-lightmapsearchpower 3 -deluxe -patchshadows -samples 3 -lightmapsize 512 -fast -fastbounce -dirty -bouncegrid';
 
 	# Default flags for the -minimap stage
 	our $MINIMAPFLAGS = '';
diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index c2d7fe6b..9e218f8f 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -154,9 +154,11 @@ getthemap()
 		continue
 	fi
 	if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
-		rm -f "$bspdir/$M-$blobhash.pk3"
-		echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"
-		return 0
+		if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+			rm -f "$bspdir/$M-$blobhash.pk3"
+			echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"
+			return 0
+		fi
 	fi
 	if ! unzip -l "$bspdir/$M-$blobhash.pk3"; then
 		rm -f "$bspdir/$M-$blobhash.pk3"
diff --git a/misc/tools/xonotic.brand b/misc/tools/xonotic.brand
index af1ed9ec..8d9be8db 100644
--- a/misc/tools/xonotic.brand
+++ b/misc/tools/xonotic.brand
@@ -5,6 +5,6 @@ dirname2=
 screenshotname=xonotic
 userdirname=xonotic
 icon_icns="$d0/misc/logos/icons_icns/xonotic.icns"
-icon_ico="$d0/misc/logos/icons_ico/xonotic_64.ico"
+icon_ico="$d0/misc/logos/icons_ico/xonotic.ico"
 icon_xpm="$d0/misc/logos/icons_xpm/xonotic_32.xpm"
 icons_tga="$d0/misc/logos/icons_png/xonotic_64.png $d0/misc/logos/icons_png/xonotic_16.png $d0/misc/logos/icons_png/xonotic_22.png $d0/misc/logos/icons_png/xonotic_24.png $d0/misc/logos/icons_png/xonotic_32.png $d0/misc/logos/icons_png/xonotic_48.png $d0/misc/logos/icons_png/xonotic_128.png $d0/misc/logos/icons_png/xonotic_256.png $d0/misc/logos/icons_png/xonotic_512.png"