X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=6831cca65da48dc052c497c1f0072b51373ed351;hb=8b78cb42e6a4030a90fb06df6b4b678b880a1760;hp=f69738a26ef7ab18a96fbd94df9ed2affba29c52;hpb=03fd9a1c7f65fe967b1b0cdefaacfa5e32cc67df;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index f69738a2..6831cca6 100755
--- a/all
+++ b/all
@@ -587,9 +587,12 @@ case "$cmd" in
 		oldbase=$base
 		oldpushbase=$pushbase
 		# transition old URLs
-		if [ x"$base" = x"ssh://xonotic@push.git.xonotic.org/" ]; then
+		if [ x"$base" = x"ssh://xonotic@git.xonotic.org/" ]; then
 			base=ssh://xonotic@push.git.xonotic.org/
 		fi
+		if [ x"$pushbase" = x"ssh://xonotic@git.xonotic.org/" ]; then
+			pushbase=ssh://xonotic@push.git.xonotic.org/
+		fi
 		while :; do
 			if [ x"$1" = x"-N" ]; then
 				allow_pull=false
@@ -1667,8 +1670,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-20110819.tar.bz2
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114.tar.bz2
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe
 			for X in *-7z.exe; do
 				7za x "$X"
 				rm -f "$X"
@@ -1788,7 +1791,7 @@ case "$cmd" in
 		verbose "$SELF" update-maps
 		;;
 	release-qc)
-		verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+		verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
 		verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
@@ -1802,7 +1805,8 @@ case "$cmd" in
 		verbose export jpeg_qual_rgb=97
 		verbose export jpeg_qual_a=99
 		verbose export do_dds=false
-		verbose export do_ogg=false
+		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
@@ -1818,6 +1822,7 @@ case "$cmd" in
 		verbose export do_dds=true
 		verbose export dds_flags=
 		verbose export do_ogg=true
+		verbose export ogg_ogg=false
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;