X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=263d7d77ca5c4e5a8e55d48514a4fb3cc9d04131;hp=35f09f9d2e3aa1aa8c73d727c2503a953511b3c9;hb=4ec5546fdebd75ee4cb81bc8ce881ffb4d6095ec;hpb=d9f43c2175c35999a30c7f0838f216328da0525b

diff --git a/all b/all
index 35f09f9d..263d7d77 100755
--- 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:"
@@ -1129,6 +1135,11 @@ case "$cmd" in
 								reportecho4 "--> test failed, postponed"
 							fi
 						else
+							# apply crlf, or other cleanup filters (non-behavioural changes)
+							git reset --hard
+							find . -type f -exec touch {} \;
+							git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
 							echo "MERGING"
 							case ",`repoflags "$d"`," in
 								*,svn,*)
@@ -1210,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
@@ -1520,7 +1544,7 @@ case "$cmd" in
 		# texture: convert to jpeg and dds
 		verbose export do_jpeg=true
 		verbose export jpeg_qual_rgb=95
-		verbose export jpeg_qual_a=99
+		verbose export jpeg_qual_a=100
 		verbose export do_dds=true
 		verbose export dds_flags=
 		verbose export do_ogg=false