From: Severin Meyer Date: Tue, 23 Dec 2014 19:48:00 +0000 (+0100) Subject: Merge branch 'master' into sev/xolonium X-Git-Tag: xonotic-v0.8.0~4^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bfdab051f22d11a553b69f28a294cb012b0b6c50;p=xonotic%2Fxonotic.git Merge branch 'master' into sev/xolonium Conflicts: data/font-xolonium.pk3dir/font-xolonium.cfg --- bfdab051f22d11a553b69f28a294cb012b0b6c50 diff --cc data/font-xolonium.pk3dir/font-xolonium.cfg index 2b6e30aa,023b64ea..f529defd --- a/data/font-xolonium.pk3dir/font-xolonium.cfg +++ b/data/font-xolonium.pk3dir/font-xolonium.cfg @@@ -1,5 -1,6 +1,6 @@@ // must be loaded AFTER config.cfg + set menu_font_cfg font-xolonium.cfg -loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize +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