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

diff --git a/all b/all
index e9ac3d3c5fc15899411a5d734ff013d079cdfd92..282a69033a903d5c1672866fbb02b1c6bd489149 100755 (executable)
--- a/all
+++ b/all
@@ -341,7 +341,7 @@ case "$cmd" in
                        pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
                        if [ -d "$d0/$d" ]; then
-                               enter "$d0/$d" verbose
+                               verbose cd "$d0/$d"
                                fix_git_config "$url" "$pushurl"
                                cd "$d0"
                        fi

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index f33566d2d9ce32fe061242bad044f0a30883a46b..d366157d3df2f4db0f7fc70839c418ddf2e89de3 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -172,7 +172,13 @@ buildthemap()
        t0=`date +%s`
        (
                cd maps
-               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+               sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
+               if [ -n "$sz" ]; then
+                       minimap_override="-minimap + -minmax ${sz#size }"
+               else
+                       minimap_override=
+               fi
+               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log"
        )
        t1=`date +%s`
        dt=$(($t1 - $t0))