Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic

diff --git a/data/font-dejavu.pk3dir/font-dejavu.cfg b/data/font-dejavu.pk3dir/font-dejavu.cfg
index ba9b4147cf34a807a5ef1e402fa20c7a9179ebc6..27c7ce300a7151e0aaf395e1069251ec4028b90f 100644 (file)
--- a/data/font-dejavu.pk3dir/font-dejavu.cfg
+++ b/data/font-dejavu.pk3dir/font-dejavu.cfg
@@ -1,7 +1,4 @@
 // must be loaded AFTER config.cfg
-utf8_enable 1
-r_font_disable_freetype 0
-r_font_size_snapping 2
 loadfont console fonts/DejaVuSansMono,gfx/conchars $con_textsize
 loadfont notify fonts/DejaVuSans-Bold,gfx/vera-sans $con_notifysize
 loadfont chat fonts/DejaVuSans-Bold,gfx/vera-sans $con_chatsize

diff --git a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 6038e0da7e8f09435acc34ebb0eb3a7797864217..37e1a3990d47b83f4fd49f56f0fc3ab397025935 100644 (file)
--- a/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@ -1,8 +1,4 @@
 // must be loaded AFTER config.cfg
-utf8_enable 1
-r_font_hinting 1 // sorry, setting 2 (full autohinting) totally fails for unifont for now
-r_font_disable_freetype 0
-r_font_size_snapping 2
 loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 loadfont notify fonts/n019004l.pfb,gfx/vera-sans $con_notifysize
 loadfont chat fonts/n019004l.pfb,gfx/vera-sans $con_chatsize