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

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 11f25d906b3e492207db59a535f539761496d81d..8922ca0905494aca142a6873077bd1b3f25c6b8c 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -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 // 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 --git a/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf b/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf
deleted file mode 100644 (file)
index ecc911d..0000000
Binary files a/data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf and /dev/null differ

diff --git a/data/font-unifont.pk3dir/fonts/README b/data/font-unifont.pk3dir/fonts/README
new file mode 100644 (file)
index 0000000..c0867d6
--- /dev/null
+++ b/data/font-unifont.pk3dir/fonts/README
@@ -0,0 +1,2 @@
+GNU Unifont 7.0.06
+http://unifoundry.com/unifont.html

diff --git a/data/font-unifont.pk3dir/fonts/unifont.ttf b/data/font-unifont.pk3dir/fonts/unifont.ttf
new file mode 100644 (file)
index 0000000..cefc731
Binary files /dev/null and b/data/font-unifont.pk3dir/fonts/unifont.ttf differ

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 81940ad2a87a048d3fd8450d76a285e31120ea81..2f98e326f4515dd706b7d9d1bd48d4a2fd053b06 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -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 // 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 --git a/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf b/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf
deleted file mode 100644 (file)
index ecc911d..0000000
Binary files a/data/font-xolonium.pk3dir/fonts/unifont-5.1.20080907.ttf and /dev/null differ

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index cb6ec82620e764311eadf16dbd28adca94f19a6e..7cc8c639063b2a441dd2eefd077bf15049a6f669 100644 (file)
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -486,6 +486,7 @@ case "$cmd" in
                ;;
        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'
@@ -533,6 +534,7 @@ case "$cmd" in
                                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 \

diff --git a/misc/tools/xzipdiff b/misc/tools/xzipdiff
index 564fa413e79d211f755c3c00dbf575d6c3562076..ad2ffa616c0f04ce978b2f1a5f038bbc23f77680 100755 (executable)
--- a/misc/tools/xzipdiff
+++ b/misc/tools/xzipdiff
@@ -18,6 +18,7 @@ excludes="
        Xonotic/data/xonotic-*-maps-low.pk3
        Xonotic/data/xonotic-*-music-low.pk3
        Xonotic/data/font-nimbussansl-*.pk3
+       Xonotic/data/font-unifont-*.pk3
        Xonotic/data/font-xolonium-*.pk3
 "