From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 20 Jan 2011 09:53:21 +0000 (+0100)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.5.0~133^2~1
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=91f9ddbf8b6818734bc6bf3b574300079ec2b709;hp=-c

Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
---

91f9ddbf8b6818734bc6bf3b574300079ec2b709
diff --combined all
index 1a0d23f4,7089f2a0..02fb854c
--- a/all
+++ b/all
@@@ -498,13 -498,16 +498,16 @@@ case "$cmd" i
  				allow_pull=false
  			elif [ x"$1" = x"-p" ]; then
  				fix_config=true
- 				if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
- 					pushbase=ssh://xonotic@git.xonotic.org/
- 				fi
+ 				pushbase=ssh://xonotic@git.xonotic.org/
+ 			elif [ x"$1" = x"-ps" ]; then
+ 				fix_config=true
+ 				pushbase=ssh://xonotic@git.xonotic.org/
+ 			elif [ x"$1" = x"-ph" ]; then
+ 				fix_config=true
+ 				pushbase=http://git.xonotic.org/login/xonotic/
  			elif [ x"$1" = x"-s" ]; then
  				fix_config=true
  				base=ssh://xonotic@git.xonotic.org/
- 				pushbase=
  			elif [ x"$1" = x"-g" ]; then
  				fix_config=true
  				base=git://git.xonotic.org/xonotic/
@@@ -549,7 -552,7 +552,7 @@@
  			best)
  				# if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
  				case "$base" in
- 					ssh://*)
+ 					ssh://*|*/login/*)
  						pushbase=$base
  						base=git://git.xonotic.org/xonotic/
  						;;
@@@ -1680,9 -1683,10 +1683,9 @@@
  		verbose cd "$dir"
  		# texture: convert to jpeg and dds
  		verbose export do_jpeg=true
 -		verbose export jpeg_qual_rgb=95
 +		verbose export jpeg_qual_rgb=97
  		verbose export jpeg_qual_a=99
 -		verbose export do_dds=true
 -		verbose export dds_flags=
 +		verbose export do_dds=false
  		verbose export do_ogg=false
  		verbose export del_src=true
  		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
@@@ -1824,11 -1828,10 +1827,11 @@@
  		;;
  	release-pack)
  		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-music.pk3dir                     raw '' low '-low'
 -		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                        low ''
 +		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  normal '-high'                   normaldds ''
  		;;
  	release-pack-needsx11)
  		case "$DISPLAY" in
@@@ -1885,7 -1888,7 +1888,7 @@@
  			Xonotic/data/xonotic-$stamp-data-high.pk3 \
  			Xonotic/data/xonotic-$stamp-maps-high.pk3 \
  			Xonotic/data/xonotic-$stamp-music.pk3 \
 -			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 +			Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
  		;;
  	release)
  		verbose "$SELF" release-prepare