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: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=bfdab051f22d11a553b69f28a294cb012b0b6c50;hp=848e42482c861a65435257292595d4e5f0f74e63 Merge branch 'master' into sev/xolonium Conflicts: 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 023b64ea..f529defd 100644 --- a/data/font-xolonium.pk3dir/font-xolonium.cfg +++ b/data/font-xolonium.pk3dir/font-xolonium.cfg @@ -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 diff --git a/data/font-xolonium.pk3dir/fonts/README b/data/font-xolonium.pk3dir/fonts/README old mode 100644 new mode 100755 index 49f91411..2ab88504 --- a/data/font-xolonium.pk3dir/fonts/README +++ b/data/font-xolonium.pk3dir/fonts/README @@ -1,25 +1,22 @@ Xolonium Font -Copyright (C) 2011-2012 Severin Meyer +Copyright (C) 2011-2014 Severin Meyer -This font is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation, either version 2 of the License, or -(at your option) any later version. +This font is free software. You can use, modify and/or redistribute it +under the terms of the GNU General Public License as published by the Free +Software Foundation, either version 2 of the license, or any later version. As a special exception, if you create a document which uses this font, -and embed this font or unaltered portions of this font into the -document, this font does not by itself cause the resulting document -to be covered by the GNU General Public License. This exception -does not however invalidate any other reasons why the document might -be covered by the GNU General Public License. If you modify this font, -you may extend this exception to your version of the font, but you are -not obligated to do so. If you do not wish to do so, delete this -exception statement from your version. +and embed this font or unaltered portions of this font into the document, +this font does not by itself cause the resulting document to be covered by +the GNU General Public License. This exception does not however invalidate +any other reasons why the document might be covered by the GNU General +Public License. If you modify this font, you may extend this exception +to your version of the font, but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from your version. -This font is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +This font is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this font. If not, see . diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf index 6363dbd0..eecc4934 100644 Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf differ diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf index 11241c2d..8ee1b4cd 100644 Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ