Merge branch 'master' into divVerent/crypto2

diff --git a/all b/all
index 4a39eed57fd55f1fb12ccc9fc49bff64b8476697..70309e057b6d2592dc5973043897ab030a7a19e3 100755 (executable)
--- 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 0406392e23c8fa1a363630d9d1ca40887017ccea..6038e0da7e8f09435acc34ebb0eb3a7797864217 100644 (file)
--- 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