Permalink
Browse files

Merge pull request #1075 from AnotherFoxGuy/font-fixes

[Fix] Fixed vehicle info not fitting in the info box
  • Loading branch information...
2 parents 2cedd09 + b21c959 commit 332020038c8c966ccab5b0d7e04370d0b68824f9 @ulteq ulteq committed on GitHub Sep 13, 2016
View
@@ -358,6 +358,101 @@ from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
```
+SourceSansPro license
+```
+Copyright (c) 2010, Adobe Systems, Inc. (http://www.adobe.com/)
+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.
+
+```
## Assets:
?
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI version="1.1" type="Resource">
+ <Resource type="ResourceTrueTypeFont" name="DefaultSmall">
+ <Property value="SourceSansPro-Regular.ttf" key="Source"/>
+ <Property value="9" key="Size"/>
+ </Resource>
+ <Resource type="ResourceTrueTypeFont" name="Default">
+ <Property value="SourceSansPro-Regular.ttf" key="Source"/>
+ <Property value="10" key="Size"/>
+ </Resource>
+ <Resource type="ResourceTrueTypeFont" name="DefaultBig">
+ <Property value="SourceSansPro-Regular.ttf" key="Source"/>
+ <Property value="14" key="Size"/>
+ </Resource>
+</MyGUI>
Binary file not shown.
@@ -41,7 +41,10 @@
<Property key="FontName" value="DefaultBig"/>
</Widget>
<Widget type="ScrollBar" skin="SliderV" position="10 35 320 1"/>
- <Widget type="EditBox" skin="WordWrapEmpty" position="10 30 320 360" name="truck_stats"/>
+ <Widget type="EditBox" skin="WordWrapEmpty" position="10 30 320 400" name="truck_stats">
+ <Property key="FontName" value="DefaultSmall"/>
+ <Property key="MaxTextLength" value="99999"/>
+ </Widget>
</Widget>
<Widget type="ImageBox" skin="ImageBox" position="535 5 485 100" align="Right Top" name="notification">
<Property key="ImageTexture" value="NotificationBg.png"/>
@@ -12,5 +12,6 @@ do
cd LC_MESSAGES
echo "Now compiling $dir"
msgfmt -o ror.mo ror.po
+ rm ror.po
cd ../../
done

0 comments on commit 3320200

Please sign in to comment.