From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 14 Oct 2010 07:32:59 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~19
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d663da215de9e01b6fadbd6eba65d9cbcc4e2fd6;hp=22579d1d9f19436956f7a546237bc6dc79296c62

Merge branch 'master' into divVerent/crypto2
---

diff --git a/all b/all
index 4a39eed5..70309e05 100755
--- a/all
+++ b/all
@@ -579,6 +579,9 @@ case "$cmd" in
 		cleanqcc=false
 		cleanqc=false
 		debug=debug
+		if [ -z "$CC" ]; then
+			export CC="gcc -DSUPPORTIPV6"
+		fi
 		while :; do
 			case "$1" in
 				-c)
@@ -590,6 +593,7 @@ case "$cmd" in
 					;;
 				-r)
 					debug=release
+					export CC="$CC -mtune=native -march=native"
 					shift
 					;;
 				*)
@@ -597,9 +601,6 @@ case "$cmd" in
 					;;
 			esac
 		done
-		if [ -z "$CC" ]; then
-			export CC="gcc -DSUPPORTIPV6"
-		fi
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			TARGETS="sv-$debug cl-$debug"
 		elif [ x"`uname`" = x"Darwin" ]; then
diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 0406392e..6038e0da 100644
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -7,7 +7,7 @@ loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 loadfont notify fonts/n019004l.pfb,gfx/vera-sans $con_notifysize
 loadfont chat fonts/n019004l.pfb,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
-loadfont infobar gfx/vera-sans 8
+loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight
 loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16
 loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 10 12 14 16 20 24 28 32 // csqc bigfont