X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=73b1e0456007bf9a8241a27dde3dfcd0064a466e;hb=b60cfbb1ea312f06180945a91a616a5273d7c216;hp=1cb555a46eae7b7c7d0363d62d74fe87e7e8a113;hpb=32a3364b398bbacdb05b66c381a4fc79685b4e21;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 1cb555a4..73b1e045 100755
--- a/all
+++ b/all
@@ -1005,6 +1005,9 @@ case "$cmd" in
 		# texture: convert to jpeg and dds
 		# music: reduce bitrate
 		export do_jpeg=false
+		export do_jpeg_if_not_dds=true
+		export jpeg_qual_rgb=80
+		export jpeg_qual_a=95
 		export do_dds=true
 		export dds_flags=
 		export do_ogg=true
@@ -1105,6 +1108,7 @@ case "$cmd" in
 		esac
 		;;
 	release-zip)
+		stamp=`cat Xonotic/stamp.txt`
 		zip -9r Xonotic-common.zip \
 			Xonotic/*.dll \
 			Xonotic/darkplaces-src \
@@ -1115,31 +1119,31 @@ case "$cmd" in
 			Xonotic/server \
 			Xonotic/*.app \
 			Xonotic/xonotic-* \
-			Xonotic/data/font-nimbussansl.pk3
+			Xonotic/data/font-nimbussansl-$stamp.pk3
 		cp Xonotic-common.zip Xonotic.zip
 		zip -0r Xonotic.zip \
-			Xonotic/data/xonotic-data.pk3 \
-			Xonotic/data/xonotic-maps.pk3 \
-			Xonotic/data/xonotic-music.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data.pk3 \
+			Xonotic/data/xonotic-$stamp-maps.pk3 \
+			Xonotic/data/xonotic-$stamp-music.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-low.zip
 		zip -0r Xonotic-low.zip \
-			Xonotic/data/xonotic-data-low.pk3 \
-			Xonotic/data/xonotic-maps-low.pk3 \
-			Xonotic/data/xonotic-music-low.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-low.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
+			Xonotic/data/xonotic-$stamp-music-low.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-lowdds.zip
 		zip -0r Xonotic-lowdds.zip \
-			Xonotic/data/xonotic-data-lowdds.pk3 \
-			Xonotic/data/xonotic-maps-lowdds.pk3 \
-			Xonotic/data/xonotic-music-low.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
+			Xonotic/data/xonotic-$stamp-music-low.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-high.zip
 		zip -0r Xonotic-high.zip \
-			Xonotic/data/xonotic-data-raw.pk3 \
-			Xonotic/data/xonotic-maps-raw.pk3 \
-			Xonotic/data/xonotic-music.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
+			Xonotic/data/xonotic-$stamp-music.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		rm -f Xonotic-common.zip
 		;;
 	release)