Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

diff --git a/all b/all
index 1a0d23f4c0ecf19b19ded7128c4f7689b1bac396..02fb854c67df82aa49699e2ea2e2abca590beea7 100755 (executable)
--- a/all
+++ b/all
@@ -498,13 +498,16 @@ case "$cmd" in
                                allow_pull=false
                        elif [ x"$1" = x"-p" ]; then
                                fix_config=true
-                               if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
-                                       pushbase=ssh://xonotic@git.xonotic.org/
-                               fi
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ps" ]; then
+                               fix_config=true
+                               pushbase=ssh://xonotic@git.xonotic.org/
+                       elif [ x"$1" = x"-ph" ]; then
+                               fix_config=true
+                               pushbase=http://git.xonotic.org/login/xonotic/
                        elif [ x"$1" = x"-s" ]; then
                                fix_config=true
                                base=ssh://xonotic@git.xonotic.org/
-                               pushbase=
                        elif [ x"$1" = x"-g" ]; then
                                fix_config=true
                                base=git://git.xonotic.org/xonotic/
@@ -549,7 +552,7 @@ case "$cmd" in
                        best)
                                # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
                                case "$base" in
-                                       ssh://*)
+                                       ssh://*|*/login/*)
                                                pushbase=$base
                                                base=git://git.xonotic.org/xonotic/
                                                ;;

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index 45c72fcaa8ab576b0f300f3a3db1c694793a1da0..03bfaa09c2c23a3ea7e94f4f7186bd5808a29541 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -3,7 +3,7 @@ loadfont console fonts/DejaVuSansMono,gfx/conchars $con_textsize
 loadfont notify fonts/DejaVuSans-Bold,gfx/vera-sans $con_notifysize
 loadfont chat fonts/DejaVuSans-Bold,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/DejaVuSansMono,gfx/conchars 9
-loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8 12 $scr_loadingscreen_barheight
+loadfont infobar fonts/DejaVuSansMono,gfx/conchars 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 loadfont user0 fonts/DejaVuSans-Bold,gfx/vera-sans 9.6 12 12.8 16
 loadfont user1 fonts/DejaVuSans-Bold,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/DejaVuSans-Bold,gfx/vera-sans 32 // csqc bigfont (remove after 0.2.0 release)

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 9fa20f54a573cc5fcafac8e1d81053ea1ffe0e38..b1aaf34874c500d5520c8f7bcce7e67f4857b05f 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -3,7 +3,7 @@ loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 loadfont notify fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
 loadfont chat fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
-loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight
+loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16 // menu font
 loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 32 // csqc bigfont for compatibility (FIXME remove in 0.2.0 release)

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index e9da754e2492fef9f03a850e3b9eea4608cef4b1..3ff04226ff12bb50e34bca57397e474d51d32932 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -3,7 +3,7 @@ loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 loadfont notify fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
 loadfont chat fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
-loadfont infobar fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight
+loadfont infobar fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 loadfont user0 fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16 // menu font
 loadfont user1 fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
 loadfont user2 fonts/xolonium.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 32 // csqc bigfont for compatibility (FIXME remove in 0.2.0 release)

diff --git a/data/font-xolonium.pk3dir/fonts/xolonium.otf b/data/font-xolonium.pk3dir/fonts/xolonium.otf
index d77ae81b0f748e49f8b48ccd2dde188bc07b407d..8ffbe0225147bbb2b6d57a3273ad4c389ea4452c 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium.otf and b/data/font-xolonium.pk3dir/fonts/xolonium.otf differ