adjusted quality factors again

[xonotic/xonotic.git] / all

diff --git a/all b/all
index f2f9dcdd2df2e2228b9c52089a0ad5408e59e33f..396002126ea551194d4cad2ef718fcc7f3aa5681 100755 (executable)
--- a/all
+++ b/all
@@ -1046,6 +1046,12 @@ case "$cmd" in
                        reportecho "$o"
                }
                for d in $repos; do
+                       case "$d" in
+                               fteqcc)
+                                       # sorry, fteqcc repo is managed manually
+                                       continue
+                                       ;;
+                       esac
                        enter "$d0/$d" verbose
                        base="`repobranch "$d"`"
                        reportecho "In $d:"
@@ -1132,7 +1138,7 @@ case "$cmd" in
                                                        # apply crlf, or other cleanup filters (non-behavioural changes)
                                                        git reset --hard
                                                        find . -type f -exec touch {} \;
-                                                       git commit -a --amend -c HEAD
+                                                       git commit -a --amend -C HEAD || true # don't fail if nothing to commit
 
                                                        echo "MERGING"
                                                        case ",`repoflags "$d"`," in
@@ -1215,8 +1221,21 @@ case "$cmd" in
                                rmuntracked=true
                        elif [ x"$X" = x"-D" ]; then
                                killbranches=true
+                       elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+                               msg ''
+                               msg '        _____'
+                               msg '    ,--'\''-\\P/`\\  FFFFFFF'
+                               msg ' __/_    B/,-.\\  FFFFFFF'
+                               msg ' /  _\\  (//  O\\\\  FFFFFF'
+                               msg '| (O  `) _\\._ _)\\  FFFUU'
+                               msg '| |___/.^d0~~"\\  \\ UUUU'
+                               msg '|     |`~'\''     \\ |  UUUU'
+                               msg '|     |    __,C>|| UUUU'
+                               msg '\\    /_ ,-/,-'\''   |  UUUU'
+                               msg ' \\\\_ \\_>~'\''      /  UUUU-'
+                               msg ''
                        else
-                               break
+                               msg "Unknown arg: $X"
                        fi
                        found=true
                        shift
@@ -1539,7 +1558,7 @@ case "$cmd" in
                # music: reduce bitrate
                verbose export do_jpeg=true
                verbose export jpeg_qual_rgb=80
-               verbose export jpeg_qual_a=99
+               verbose export jpeg_qual_a=97
                verbose export do_dds=false
                verbose export do_ogg=true
                verbose export ogg_qual=1