diff --git a/fonts/FontCredits.txt b/fonts/FontCredits.txt index f550d017..3fecfe4b 100644 --- a/fonts/FontCredits.txt +++ b/fonts/FontCredits.txt @@ -1,6 +1,6 @@ Portal 2: Community Edition uses the following fonts with their respective licenses below: -1. Lexend Deca +1. Lexend / Lexend Deca Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend), with Reserved Font Name “RevReading Lexend”. @@ -192,3 +192,100 @@ 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. + +3. Noto Sans + +Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic) + +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: +https://openfontlicense.org + + +----------------------------------------------------------- +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. + diff --git a/fonts/LexendDeca-Black.ttf b/fonts/Lexend-Black.ttf similarity index 97% rename from fonts/LexendDeca-Black.ttf rename to fonts/Lexend-Black.ttf index a0da6f41..ff444806 100644 Binary files a/fonts/LexendDeca-Black.ttf and b/fonts/Lexend-Black.ttf differ diff --git a/fonts/Lexend-BlackItalic.ttf b/fonts/Lexend-BlackItalic.ttf new file mode 100644 index 00000000..12b01c45 Binary files /dev/null and b/fonts/Lexend-BlackItalic.ttf differ diff --git a/fonts/LexendDeca-Bold.ttf b/fonts/Lexend-Bold.ttf similarity index 97% rename from fonts/LexendDeca-Bold.ttf rename to fonts/Lexend-Bold.ttf index 82091e71..97614b98 100644 Binary files a/fonts/LexendDeca-Bold.ttf and b/fonts/Lexend-Bold.ttf differ diff --git a/fonts/Lexend-BoldItalic.ttf b/fonts/Lexend-BoldItalic.ttf new file mode 100644 index 00000000..43f86afa Binary files /dev/null and b/fonts/Lexend-BoldItalic.ttf differ diff --git a/fonts/LexendDeca-ExtraBold.ttf b/fonts/Lexend-ExtraBold.ttf similarity index 97% rename from fonts/LexendDeca-ExtraBold.ttf rename to fonts/Lexend-ExtraBold.ttf index f5dad4c2..641ab9bb 100644 Binary files a/fonts/LexendDeca-ExtraBold.ttf and b/fonts/Lexend-ExtraBold.ttf differ diff --git a/fonts/Lexend-ExtraBoldItalic.ttf b/fonts/Lexend-ExtraBoldItalic.ttf new file mode 100644 index 00000000..51588c72 Binary files /dev/null and b/fonts/Lexend-ExtraBoldItalic.ttf differ diff --git a/fonts/LexendDeca-ExtraLight.ttf b/fonts/Lexend-ExtraLight.ttf similarity index 96% rename from fonts/LexendDeca-ExtraLight.ttf rename to fonts/Lexend-ExtraLight.ttf index cb6c06a1..fececa0e 100644 Binary files a/fonts/LexendDeca-ExtraLight.ttf and b/fonts/Lexend-ExtraLight.ttf differ diff --git a/fonts/Lexend-ExtraLightItalic.ttf b/fonts/Lexend-ExtraLightItalic.ttf new file mode 100644 index 00000000..e0930d32 Binary files /dev/null and b/fonts/Lexend-ExtraLightItalic.ttf differ diff --git a/fonts/LexendDeca-Light.ttf b/fonts/Lexend-Light.ttf similarity index 97% rename from fonts/LexendDeca-Light.ttf rename to fonts/Lexend-Light.ttf index 14e012c6..1b67c78b 100644 Binary files a/fonts/LexendDeca-Light.ttf and b/fonts/Lexend-Light.ttf differ diff --git a/fonts/Lexend-LightItalic.ttf b/fonts/Lexend-LightItalic.ttf new file mode 100644 index 00000000..7d49aa44 Binary files /dev/null and b/fonts/Lexend-LightItalic.ttf differ diff --git a/fonts/LexendDeca-Medium.ttf b/fonts/Lexend-Medium.ttf similarity index 97% rename from fonts/LexendDeca-Medium.ttf rename to fonts/Lexend-Medium.ttf index 3ae3458c..a56f1e9b 100644 Binary files a/fonts/LexendDeca-Medium.ttf and b/fonts/Lexend-Medium.ttf differ diff --git a/fonts/Lexend-MediumItalic.ttf b/fonts/Lexend-MediumItalic.ttf new file mode 100644 index 00000000..7ce99172 Binary files /dev/null and b/fonts/Lexend-MediumItalic.ttf differ diff --git a/fonts/LexendDeca-Regular.ttf b/fonts/Lexend-Regular.ttf similarity index 97% rename from fonts/LexendDeca-Regular.ttf rename to fonts/Lexend-Regular.ttf index 10f5e24f..b869458f 100644 Binary files a/fonts/LexendDeca-Regular.ttf and b/fonts/Lexend-Regular.ttf differ diff --git a/fonts/Lexend-RegularItalic.ttf b/fonts/Lexend-RegularItalic.ttf new file mode 100644 index 00000000..5b2be022 Binary files /dev/null and b/fonts/Lexend-RegularItalic.ttf differ diff --git a/fonts/LexendDeca-SemiBold.ttf b/fonts/Lexend-SemiBold.ttf similarity index 96% rename from fonts/LexendDeca-SemiBold.ttf rename to fonts/Lexend-SemiBold.ttf index 97551ef3..436b93b5 100644 Binary files a/fonts/LexendDeca-SemiBold.ttf and b/fonts/Lexend-SemiBold.ttf differ diff --git a/fonts/Lexend-SemiBoldItalic.ttf b/fonts/Lexend-SemiBoldItalic.ttf new file mode 100644 index 00000000..272e3b3e Binary files /dev/null and b/fonts/Lexend-SemiBoldItalic.ttf differ diff --git a/fonts/LexendDeca-Thin.ttf b/fonts/Lexend-Thin.ttf similarity index 97% rename from fonts/LexendDeca-Thin.ttf rename to fonts/Lexend-Thin.ttf index 68bad7cf..3bd5c47d 100644 Binary files a/fonts/LexendDeca-Thin.ttf and b/fonts/Lexend-Thin.ttf differ diff --git a/fonts/Lexend-ThinItalic.ttf b/fonts/Lexend-ThinItalic.ttf new file mode 100644 index 00000000..7998f4cd Binary files /dev/null and b/fonts/Lexend-ThinItalic.ttf differ diff --git a/fonts/NotoSans-Black.ttf b/fonts/NotoSans-Black.ttf new file mode 100644 index 00000000..d5a6e0d1 Binary files /dev/null and b/fonts/NotoSans-Black.ttf differ diff --git a/fonts/NotoSans-BlackItalic.ttf b/fonts/NotoSans-BlackItalic.ttf new file mode 100644 index 00000000..dfc640c3 Binary files /dev/null and b/fonts/NotoSans-BlackItalic.ttf differ diff --git a/fonts/NotoSans-Bold.ttf b/fonts/NotoSans-Bold.ttf new file mode 100644 index 00000000..07f0d257 Binary files /dev/null and b/fonts/NotoSans-Bold.ttf differ diff --git a/fonts/NotoSans-BoldItalic.ttf b/fonts/NotoSans-BoldItalic.ttf new file mode 100644 index 00000000..e538eaed Binary files /dev/null and b/fonts/NotoSans-BoldItalic.ttf differ diff --git a/fonts/NotoSans-ExtraBold.ttf b/fonts/NotoSans-ExtraBold.ttf new file mode 100644 index 00000000..58684467 Binary files /dev/null and b/fonts/NotoSans-ExtraBold.ttf differ diff --git a/fonts/NotoSans-ExtraBoldItalic.ttf b/fonts/NotoSans-ExtraBoldItalic.ttf new file mode 100644 index 00000000..68abd4c0 Binary files /dev/null and b/fonts/NotoSans-ExtraBoldItalic.ttf differ diff --git a/fonts/NotoSans-ExtraLight.ttf b/fonts/NotoSans-ExtraLight.ttf new file mode 100644 index 00000000..078f8dc8 Binary files /dev/null and b/fonts/NotoSans-ExtraLight.ttf differ diff --git a/fonts/NotoSans-ExtraLightItalic.ttf b/fonts/NotoSans-ExtraLightItalic.ttf new file mode 100644 index 00000000..acaa4664 Binary files /dev/null and b/fonts/NotoSans-ExtraLightItalic.ttf differ diff --git a/fonts/NotoSans-Italic.ttf b/fonts/NotoSans-Italic.ttf new file mode 100644 index 00000000..d9b9e148 Binary files /dev/null and b/fonts/NotoSans-Italic.ttf differ diff --git a/fonts/NotoSans-Light.ttf b/fonts/NotoSans-Light.ttf new file mode 100644 index 00000000..8d8a6789 Binary files /dev/null and b/fonts/NotoSans-Light.ttf differ diff --git a/fonts/NotoSans-LightItalic.ttf b/fonts/NotoSans-LightItalic.ttf new file mode 100644 index 00000000..0ab65c0d Binary files /dev/null and b/fonts/NotoSans-LightItalic.ttf differ diff --git a/fonts/NotoSans-Medium.ttf b/fonts/NotoSans-Medium.ttf new file mode 100644 index 00000000..a44124bb Binary files /dev/null and b/fonts/NotoSans-Medium.ttf differ diff --git a/fonts/NotoSans-MediumItalic.ttf b/fonts/NotoSans-MediumItalic.ttf new file mode 100644 index 00000000..467af1b3 Binary files /dev/null and b/fonts/NotoSans-MediumItalic.ttf differ diff --git a/fonts/NotoSans-Regular.ttf b/fonts/NotoSans-Regular.ttf new file mode 100644 index 00000000..4bac02f2 Binary files /dev/null and b/fonts/NotoSans-Regular.ttf differ diff --git a/fonts/NotoSans-SemiBold.ttf b/fonts/NotoSans-SemiBold.ttf new file mode 100644 index 00000000..e8467490 Binary files /dev/null and b/fonts/NotoSans-SemiBold.ttf differ diff --git a/fonts/NotoSans-SemiBoldItalic.ttf b/fonts/NotoSans-SemiBoldItalic.ttf new file mode 100644 index 00000000..cacc7ece Binary files /dev/null and b/fonts/NotoSans-SemiBoldItalic.ttf differ diff --git a/fonts/NotoSans-Thin.ttf b/fonts/NotoSans-Thin.ttf new file mode 100644 index 00000000..04335a5b Binary files /dev/null and b/fonts/NotoSans-Thin.ttf differ diff --git a/fonts/NotoSans-ThinItalic.ttf b/fonts/NotoSans-ThinItalic.ttf new file mode 100644 index 00000000..910dfc74 Binary files /dev/null and b/fonts/NotoSans-ThinItalic.ttf differ diff --git a/fonts/stratum2bold.ttf b/fonts/stratum2bold.ttf new file mode 100644 index 00000000..d3516c5f Binary files /dev/null and b/fonts/stratum2bold.ttf differ diff --git a/fonts/stratum2bold.vfont b/fonts/stratum2bold.vfont deleted file mode 100644 index afc824a6..00000000 Binary files a/fonts/stratum2bold.vfont and /dev/null differ diff --git a/fonts/stratum2bold_monodigit.ttf b/fonts/stratum2bold_monodigit.ttf new file mode 100644 index 00000000..1ad93621 Binary files /dev/null and b/fonts/stratum2bold_monodigit.ttf differ diff --git a/fonts/stratum2bold_monodigit.vfont b/fonts/stratum2bold_monodigit.vfont deleted file mode 100644 index 6f93aaab..00000000 Binary files a/fonts/stratum2bold_monodigit.vfont and /dev/null differ diff --git a/fonts/stratum2light.ttf b/fonts/stratum2light.ttf new file mode 100644 index 00000000..3635cd8c Binary files /dev/null and b/fonts/stratum2light.ttf differ diff --git a/fonts/stratum2light.vfont b/fonts/stratum2light.vfont deleted file mode 100644 index 92b54dd0..00000000 Binary files a/fonts/stratum2light.vfont and /dev/null differ diff --git a/fonts/stratum2medium.ttf b/fonts/stratum2medium.ttf new file mode 100644 index 00000000..93cad7a1 Binary files /dev/null and b/fonts/stratum2medium.ttf differ diff --git a/fonts/stratum2medium.vfont b/fonts/stratum2medium.vfont deleted file mode 100644 index 038fc7eb..00000000 Binary files a/fonts/stratum2medium.vfont and /dev/null differ diff --git a/fonts/stratum2regular.ttf b/fonts/stratum2regular.ttf new file mode 100644 index 00000000..a2d60098 Binary files /dev/null and b/fonts/stratum2regular.ttf differ diff --git a/fonts/stratum2regular.vfont b/fonts/stratum2regular.vfont deleted file mode 100644 index dac4c23c..00000000 Binary files a/fonts/stratum2regular.vfont and /dev/null differ diff --git a/fonts/stratum2regular_monodigit.ttf b/fonts/stratum2regular_monodigit.ttf new file mode 100644 index 00000000..1718ddcc Binary files /dev/null and b/fonts/stratum2regular_monodigit.ttf differ diff --git a/fonts/stratum2regular_monodigit.vfont b/fonts/stratum2regular_monodigit.vfont deleted file mode 100644 index 073c445b..00000000 Binary files a/fonts/stratum2regular_monodigit.vfont and /dev/null differ diff --git a/fonts/univercb.ttf b/fonts/univercb.ttf new file mode 100644 index 00000000..23a018d6 Binary files /dev/null and b/fonts/univercb.ttf differ diff --git a/fonts/univercb_t.ttf b/fonts/univercb_t.ttf new file mode 100644 index 00000000..5e386ffd Binary files /dev/null and b/fonts/univercb_t.ttf differ diff --git a/fonts/univercl.ttf b/fonts/univercl.ttf new file mode 100644 index 00000000..8bda6b89 Binary files /dev/null and b/fonts/univercl.ttf differ diff --git a/fonts/univercl_t.ttf b/fonts/univercl_t.ttf new file mode 100644 index 00000000..4006ec80 Binary files /dev/null and b/fonts/univercl_t.ttf differ diff --git a/fonts/universc.ttf b/fonts/universc.ttf new file mode 100644 index 00000000..f091cffa Binary files /dev/null and b/fonts/universc.ttf differ diff --git a/fonts/universc_t.ttf b/fonts/universc_t.ttf new file mode 100644 index 00000000..fe4f5533 Binary files /dev/null and b/fonts/universc_t.ttf differ diff --git a/layout/components/item-source.xml b/layout/components/item-source.xml index 99b4c29e..1da70df9 100644 --- a/layout/components/item-source.xml +++ b/layout/components/item-source.xml @@ -3,8 +3,9 @@ - + + + + + + + + + + + diff --git a/layout/hud/hud.xml b/layout/hud/hud.xml index 4304f3df..1bf9eab5 100644 --- a/layout/hud/hud.xml +++ b/layout/hud/hud.xml @@ -54,6 +54,8 @@ + + diff --git a/layout/pages/campaigns/campaign-selector.xml b/layout/pages/campaigns/campaign-selector.xml index d5db5169..b98fc7e2 100644 --- a/layout/pages/campaigns/campaign-selector.xml +++ b/layout/pages/campaigns/campaign-selector.xml @@ -51,7 +51,7 @@ textureheight="64" /> - + diff --git a/layout/pages/main-menu/base-menu.xml b/layout/pages/main-menu/base-menu.xml index f7dfb1ac..1331a8b5 100644 --- a/layout/pages/main-menu/base-menu.xml +++ b/layout/pages/main-menu/base-menu.xml @@ -96,7 +96,10 @@ - + + +