Skip to content

Commit

Permalink
Upgraded the fonts used in Valyria Tear.
Browse files Browse the repository at this point in the history
The commit is based on the complain of several people telling
it was kinda hard to read the text sometimes, especially the numbers.

By using bold fonts, and a sans serif one for the numbers
actually helps a lot in the readability without changing the space
used.

I didn't changed the font internal name to reduce the commit scope,
and I'll come back to that by making it more flexible in another commit.

Changing the font wasn't an easy choice as it quite change the personality
of the overall game.
  • Loading branch information
Yohann Ferreira committed Sep 16, 2012
1 parent a44e298 commit ddbf7e7
Show file tree
Hide file tree
Showing 13 changed files with 457 additions and 47 deletions.
12 changes: 4 additions & 8 deletions LICENSES
@@ -1,7 +1,7 @@
Licenses
========

Last update: 2012.09.13
Last update: 2012.09.16

This file is listing all the files licenses from the point of the fork
from the Allacrost project.
Expand Down Expand Up @@ -124,6 +124,9 @@ img/effects/emotes/exclamation.png CC by SA 3.0
img/effects/emotes/interrogation.lua GPLv2 or later Bertram
img/effects/emotes/interrogation.png CC by SA 3.0 Bertram

img/fonts/LinBiolinum_RBah.ttf OFL 1.1 / GPLv2 Philipp H. Poll - http://www.linuxlibertine.org
img/fonts/LinLibertine_aBS.ttf OFL 1.1 / GPLv2 Philipp H. Poll - http://www.linuxlibertine.org

img/icons/actors/characters/kalya.png GPLv2 Allacrost (was Laila icon)
img/icons/actors/characters/sylve.png GPLv2 Allacrost (was Raphaela icon)
img/icons/actors/characters/thanis.png GPLv2 Allacrost (was Claudius icon)
Expand Down Expand Up @@ -502,13 +505,6 @@ Files:
./img/logos/mac_logo.icns
./img/logos/main_logo_sword.png

./img/fonts (See the COPYING file in the same folder for those).
./img/fonts/libertine.ttf
./img/fonts/vtc_switchblade_romance.ttf
./img/fonts/junicode_regular.ttf
./img/fonts/tarnhalo.ttf
./img/fonts/libertine_capitals.ttf

./img/misc/chest1.png
./img/misc/stamina_bar_infinite_overlay.png
./img/misc/dialogue_icon.png
Expand Down
17 changes: 0 additions & 17 deletions img/fonts/COPYING

This file was deleted.

343 changes: 343 additions & 0 deletions img/fonts/GPL.txt

Large diffs are not rendered by default.

Binary file added img/fonts/LinBiolinum_RBah.ttf
Binary file not shown.
Binary file added img/fonts/LinLibertine_aBS.ttf
Binary file not shown.
94 changes: 94 additions & 0 deletions img/fonts/OFL-1.1.txt
@@ -0,0 +1,94 @@
Copyright (c) 2003–2012, Philipp H. Poll (www.linuxlibertine.org | gillian at linuxlibertine.org),
with Reserved Font Name "Linux Libertine" and "Biolinum".

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file removed img/fonts/junicode_regular.ttf
Binary file not shown.
Binary file removed img/fonts/libertine.ttf
Binary file not shown.
Binary file removed img/fonts/libertine_capitals.ttf
Binary file not shown.
Binary file removed img/fonts/tarnhalo.ttf
Binary file not shown.
Binary file removed img/fonts/vtc_switchblade_romance.ttf
Binary file not shown.
6 changes: 0 additions & 6 deletions src/engine/video/text.cpp
Expand Up @@ -537,12 +537,6 @@ bool TextSupervisor::SingletonInitialize() {
return false;
}

if (LoadFont("img/fonts/junicode_regular.ttf", "debug_font", 16) == false) {
PRINT_ERROR << "could not load the debug font" << std::endl;
TTF_Quit();
return false;
}

return true;
}

Expand Down
32 changes: 16 additions & 16 deletions src/main.cpp
Expand Up @@ -271,30 +271,30 @@ void InitializeEngine() throw (Exception) {
GUIManager->DEBUG_EnableGUIOutlines(false);

// Load all standard font sets used across the game
if (VideoManager->Text()->LoadFont("img/fonts/libertine_capitals.ttf", "title20", 20) == false) {
throw Exception("Failed to load libertine_capitals.ttf font at size 20", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinLibertine_aBS.ttf", "title20", 18) == false) {
throw Exception("Failed to load libertine_capitals.ttf font at size 18", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine_capitals.ttf", "title22", 22) == false) {
throw Exception("Failed to load libertine_capitals.ttf font at size 22", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinLibertine_aBS.ttf", "title22", 20) == false) {
throw Exception("Failed to load 'img/fonts/LinLibertine_aBS.ttf' font at size 20", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine_capitals.ttf", "title24", 24) == false) {
throw Exception("Failed to load libertine_capitals.ttf font at size 24", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinLibertine_aBS.ttf", "title24", 22) == false) {
throw Exception("Failed to load 'img/fonts/LinLibertine_aBS.ttf' font at size 22", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine_capitals.ttf", "title28", 28) == false) {
throw Exception("Failed to load libertine_capitals.ttf font at size 28", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinLibertine_aBS.ttf", "title28", 24) == false) {
throw Exception("Failed to load 'img/fonts/LinLibertine_aBS.ttf' font at size 24", __FILE__, __LINE__, __FUNCTION__);
}

if (VideoManager->Text()->LoadFont("img/fonts/libertine.ttf", "text18", 18) == false) {
throw Exception("Failed to load libertine.ttf font at size 18", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinBiolinum_RBah.ttf", "text18", 16) == false) {
throw Exception("Failed to load 'img/fonts/LinBiolinum_RBah.ttf' font at size 16", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine.ttf", "text20", 20) == false) {
throw Exception("Failed to load libertine.ttf font at size 20", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinBiolinum_RBah.ttf", "text20", 18) == false) {
throw Exception("Failed to load 'img/fonts/LinBiolinum_RBah.ttf' font at size 18", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine.ttf", "text22", 22) == false) {
throw Exception("Failed to load libertine.ttf font at size 22", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinBiolinum_RBah.ttf", "text22", 20) == false) {
throw Exception("Failed to load 'img/fonts/LinBiolinum_RBah.ttf' font at size 20", __FILE__, __LINE__, __FUNCTION__);
}
if (VideoManager->Text()->LoadFont("img/fonts/libertine.ttf", "text24", 24) == false) {
throw Exception("Failed to load libertine.ttf font at size 24", __FILE__, __LINE__, __FUNCTION__);
if (VideoManager->Text()->LoadFont("img/fonts/LinBiolinum_RBah.ttf", "text24", 22) == false) {
throw Exception("Failed to load 'img/fonts/LinBiolinum_RBah.ttf' font at size 22", __FILE__, __LINE__, __FUNCTION__);
}

VideoManager->Text()->SetDefaultStyle(TextStyle("text22", Color::white, VIDEO_TEXT_SHADOW_BLACK, 1, -2));
Expand Down

0 comments on commit ddbf7e7

Please sign in to comment.