X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=all;h=51491362d4c818305ed4242d1405f05e093771ea;hb=2014b6b0ef229c57f4be27fff07e85a22b9712f9;hp=9af0b7c4db9ad5be1d24b378aa8c7ce1e5f6580c;hpb=7f0123ca428c031539cea915380c48f75b4ba67e;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 9af0b7c4..51491362 100755
--- a/all
+++ b/all
@@ -1668,8 +1668,8 @@ case "$cmd" in
 		rm -f Xonotic/key_15.d0pk
 		{
 			verbose cd Xonotic/mapping
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819.tar.bz2
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe
 			for X in *-7z.exe; do
 				7za x "$X"
 				rm -f "$X"
@@ -1852,6 +1852,29 @@ case "$cmd" in
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
+	release-buildpk3-transform-mapping)
+		dir=$1
+		verbose cd "$dir"
+		# remove stuff radiant has no use for
+		verbose find . -name \*_norm.\* -exec rm -f {} \;
+		verbose find . -name \*_bump.\* -exec rm -f {} \;
+		verbose find . -name \*_glow.\* -exec rm -f {} \;
+		verbose find . -name \*_gloss.\* -exec rm -f {} \;
+		verbose find . -name \*_pants.\* -exec rm -f {} \;
+		verbose find . -name \*_shirt.\* -exec rm -f {} \;
+		verbose find . -name \*_reflect.\* -exec rm -f {} \;
+		verbose find . -not \( -name \*.tga -o -name \*.png -o -name \*.jpg \) -exec rm -f {} \;
+		# texture: convert to jpeg and dds
+		# music: reduce bitrate
+		verbose export do_jpeg=true
+		verbose export jpeg_qual_rgb=80
+		verbose export jpeg_qual_a=97
+		verbose export do_dds=false
+		verbose export do_ogg=true
+		verbose export ogg_qual=1
+		verbose export del_src=true
+		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
+		;;
 	release-buildpk3)
 		src=$1
 		dst=$2
@@ -1887,7 +1910,7 @@ case "$cmd" in
 					versionstr="$versionstr$RELEASETYPE"
 					;;
 			esac
-			if [ $gv -lt 900 ]; then
+			if [ $gv -lt 9900 ]; then
 				# pre-1.0: compatible with any other pre-1.0
 				verbose sed "
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
@@ -1959,7 +1982,7 @@ case "$cmd" in
 		verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir                  raw ''
 		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir                     raw ''
 		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '-high'        low '-low' normaldds ''
-		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '-high'        low '-low' normaldds ''
+		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '-high'        low '-low' normaldds '' mapping '-mapping'
 		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                     raw '' low '-low'
 		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  normal '-high'                   normaldds ''
 		;;
@@ -2028,7 +2051,7 @@ case "$cmd" in
 		verbose mkzip Xonotic-$stamp-mappingsupport.zip \
 			Xonotic/mapping
 		verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \
-			Xonotic/data/xonotic-$stamp-maps-low.pk3
+			Xonotic/data/xonotic-$stamp-maps-mapping.pk3
 		;;
 	release)
 		verbose "$SELF" release-prepare