Merge branch 'master' into sev/xolonium

[xonotic/xonotic.git] / data / font-xolonium.pk3dir / font-xolonium.cfg

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 2b6e30aa504b7988c8599f86dd7a370a42a42b69..f529defdb67f4cc75e5b9327f017885b8d13f00e 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -1,11 +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 9.6 12 // menu font
+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 $scr_centersize // 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 $scr_centersize // csqc bold font
-loadfont user3 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 12.8 16 // menu boldfont
+loadfont user3 fonts/xolonium-bold.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 16 // menu boldfont
 scoreboard_columns_set