From: Severin Meyer <sev.ch@web.de>
Date: Thu, 11 Jun 2015 17:27:33 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update
X-Git-Tag: xonotic-v0.8.1~4^2
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=2627fa199fee9062e810d1bde97d5a9ce0ffe5c8;hp=-c

Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update

Conflicts:
	data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
	data/font-xolonium.pk3dir/font-xolonium.cfg
---

2627fa199fee9062e810d1bde97d5a9ce0ffe5c8
diff --combined data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index cfc66eb8,11f25d90..8922ca09
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@@ -1,12 -1,12 +1,12 @@@
  // must be loaded AFTER config.cfg
  set menu_font_cfg font-nimbussansl.cfg
 -loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 -loadfont notify fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
 -loadfont chat fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 -loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
 -loadfont infobar fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 -loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // menu font
 -loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
 -loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc boldfont
 -loadfont user3 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 12 16 // menu boldfont
 +loadfont console fonts/unifont,gfx/vera-sans $con_textsize
 +loadfont notify fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans $con_notifysize
 +loadfont chat fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans $con_chatsize
 +loadfont centerprint fonts/unifont,gfx/vera-sans 9
 +loadfont infobar fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 +loadfont user0 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 12 // menu font
- loadfont user1 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
- loadfont user2 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc boldfont
- loadfont user3 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 16 // menu boldfont
++loadfont user1 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
++loadfont user2 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc boldfont
++loadfont user3 fonts/n019004l.pfb,fonts/unifont,gfx/vera-sans 12 16 // menu boldfont
  scoreboard_columns_set
diff --combined data/font-xolonium.pk3dir/font-xolonium.cfg
index dba8318d,81940ad2..2f98e326
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@@ -1,12 -1,12 +1,12 @@@
  // must be loaded AFTER config.cfg
  set menu_font_cfg font-xolonium.cfg
 -loadfont console fonts/unifont-5.1.20080907,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize
 -loadfont notify fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
 -loadfont chat fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 -loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9
 -loadfont infobar fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 -loadfont user0 fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12 // menu font
 -loadfont user1 fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
 -loadfont user2 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font
 -loadfont user3 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12 16 // menu boldfont
 +loadfont console fonts/unifont,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize
 +loadfont notify fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_notifysize
 +loadfont chat fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans $con_chatsize
 +loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 9
 +loadfont infobar fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 8 12 $scr_loadingscreen_barheight $scr_infobar_height
 +loadfont user0 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 12 // menu font
- loadfont user1 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc font
- loadfont user2 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize $scr_centersize // csqc bold font
- loadfont user3 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 16 // menu boldfont
++loadfont user1 fonts/xolonium-regular.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc font
++loadfont user2 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 4 6 8 10 12 14 16 20 24 28 32 $hud_fontsize // csqc bold font
++loadfont user3 fonts/xolonium-bold.otf,fonts/unifont,gfx/vera-sans 12 16 // menu boldfont
  scoreboard_columns_set
diff --combined misc/tools/all/release.subr
index 401b9bbb,cb6ec826..7cc8c639
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@@ -207,15 -207,12 +207,12 @@@ case "$cmd" i
  		release_common
  		binary=$1
  		basename=${binary##*/}
+ 		dpname=darkplaces${basename#xonotic}
  		rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
- 		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
+ 		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$dpname"
  		[ -s "$binary" ] || rm -f "$binary"
  		[ -f "$binary" ]
- 		# TODO eventually do the rebranding on travis too.
  		case "$binary" in
- 			Xonotic/xonotic*.exe)
- 				verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
- 				;;
  			Xonotic/*osx*|Xonotic/*linux*)
  				chmod +x "$binary"
  				;;
@@@ -224,17 -221,17 +221,17 @@@
  	release-engine-win32)
  		release_common
  		good=true
- 		verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-sdl.exe || good=false
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-wgl.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
  		$good
  		;;
  	release-engine-win64)
  		release_common
  		good=true
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || good=false
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-x64-sdl.exe || good=false
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-wgl.exe || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
  		$good
  		;;
  	release-engine-osx)
@@@ -247,16 -244,16 +244,16 @@@
  	release-engine-linux32)
  		release_common
  		good=true
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || good=false
  		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || good=false
  		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || good=false
  		$good
  		;;
  	release-engine-linux64)
  		release_common
  		good=true
- 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
  		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
+ 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
  		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
  		$good
  		;;
@@@ -489,7 -486,6 +486,7 @@@
  		;;
  	release-pack)
  		release_common
 +		verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
  		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
  		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    normal '-high'
  		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' normal '-high'
@@@ -537,7 -533,6 +534,7 @@@
  				Xonotic/gmqcc \
  				Xonotic/server \
  				Xonotic/key_0.d0pk \
 +				Xonotic/data/font-unifont-$pk3stamp.pk3 \
  				Xonotic/data/font-xolonium-$pk3stamp.pk3
  			verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip
  			verbose mkzip Xonotic-$stamp-source$suffix.zip \