"low" and "lowdds" transform: use 99% for alpha/lightmap/deluxemap

[xonotic/xonotic.git] / all

diff --git a/all b/all
index ce7cdbde86a0d9f54cf8407e07390e51eb36337a..e92e4d56e9bf0d9d805c47680cc35ad4b51991f9 100755 (executable)
--- a/all
+++ b/all
@@ -312,7 +312,7 @@ fix_git_config()
        if [ -z "`git config push.default || true`" ]; then
                verbose git config push.default current # or is tracking better?
        fi
-       verbose git config filter.mapclean.clean "grep ^[^/]"
+       verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
        verbose git config filter.mapclean.smudge "cat"
 }
 
@@ -1396,9 +1396,9 @@ case "$cmd" in
                        # now rebrand the binaries...
                        for f in $targetfiles; do
                                #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
-                               case "$f" in
+                               case "${f##*:}" in
                                        xonotic*.exe)
-                                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+                                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
                                                (
                                                        d=`mktemp -d -t rebrand.XXXXXX`
                                                        cd "$d"
@@ -1407,7 +1407,7 @@ case "$cmd" in
                                                        cat darkplaces.zip
                                                        cd "$d0"
                                                        rm -rf "$d"
-                                               ) >> "$f"
+                                               ) >> "${f##*:}"
                                                ;;
                                esac
                        done
@@ -1518,7 +1518,7 @@ case "$cmd" in
                # music: reduce bitrate
                verbose export do_jpeg=true
                verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=95
+               verbose export jpeg_qual_a=99
                verbose export do_dds=false
                verbose export do_ogg=true
                verbose export ogg_qual=1
@@ -1533,7 +1533,7 @@ case "$cmd" in
                verbose export do_jpeg=false
                verbose export do_jpeg_if_not_dds=true
                verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=95
+               verbose export jpeg_qual_a=99
                verbose export do_dds=true
                verbose export dds_flags=
                verbose export do_ogg=true