diff --git a/CMakeLists.txt b/CMakeLists.txt index d1bcfa832e..96092a2f61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -921,7 +921,6 @@ elseif(NOT APPLE) INSTALL(FILES "${OpenMW_SOURCE_DIR}/CHANGELOG.md" DESTINATION "." RENAME "CHANGELOG.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/README.md" DESTINATION "." RENAME "README.txt") INSTALL(FILES "${OpenMW_SOURCE_DIR}/LICENSE" DESTINATION "." RENAME "LICENSE.txt") - INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/mygui/DejaVuFontLicense.txt" DESTINATION ".") INSTALL(FILES "${INSTALL_SOURCE}/defaults.bin" DESTINATION ".") INSTALL(FILES "${INSTALL_SOURCE}/gamecontrollerdb.txt" DESTINATION ".") @@ -1023,9 +1022,6 @@ elseif(NOT APPLE) INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-bulletobjecttool" DESTINATION "${BINDIR}" ) ENDIF(BUILD_BULLETOBJECTTOOL) - # Install licenses - INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" ) - # Install icon and desktop file INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw") INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw") diff --git a/README.md b/README.md index 2f21f8211b..b1ea6cbde3 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,9 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set. Font Licenses: -* DejaVuLGCSansMono.ttf: custom (see [files/mygui/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/mygui/DejaVuFontLicense.txt) for more information) +* DejaVuLGCSansMono.ttf: custom (see [files/data/fonts/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/DejaVuFontLicense.txt) for more information) +* OMWAyembedt.ttf: SIL Open Font License (see [files/data/fonts/OMWAyembedtFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/OMWAyembedtFontLicense.txt) for more information) +* Pelagiad.ttf: SIL Open Font License (see [files/data/fonts/PelagiadFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/PelagiadFontLicense.txt) for more information) Current Status -------------- diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 76c164c90e..4d10b47963 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -1037,13 +1037,13 @@ void OMW::Engine::go() } // Setup profiler - osg::ref_ptr statshandler = new Resource::Profiler(stats.is_open()); + osg::ref_ptr statshandler = new Resource::Profiler(stats.is_open(), mVFS.get()); initStatsHandler(*statshandler); mViewer->addEventHandler(statshandler); - osg::ref_ptr resourceshandler = new Resource::StatsHandler(stats.is_open()); + osg::ref_ptr resourceshandler = new Resource::StatsHandler(stats.is_open(), mVFS.get()); mViewer->addEventHandler(resourceshandler); if (stats.is_open()) diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 5442b22df2..382f489e20 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -195,7 +195,7 @@ namespace MWGui { mScalingFactor = std::clamp(Settings::Manager::getFloat("scaling factor", "GUI"), 0.5f, 8.f); mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), mScalingFactor); - mGuiPlatform->initialise(resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string()); + mGuiPlatform->initialise(resourceSystem->getVFS(), resourcePath, (std::filesystem::path(logpath) / "MyGUI.log").generic_string()); mGui = new MyGUI::Gui; mGui->initialise(""); diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index 4e370a729a..ab4ca24eee 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -214,17 +214,17 @@ namespace Gui return; } - const std::string cfg = dataManager->getDataPath(""); - const std::string fontFile = mUserDataPath + "/" + "Fonts" + "/" + "openmw_font.xml"; - if (!std::filesystem::exists(fontFile)) - return; + dataManager->setUseVfs(true); - dataManager->setResourcePath(mUserDataPath + "/" + "Fonts"); - MyGUI::ResourceManager::getInstance().load("openmw_font.xml"); - dataManager->setResourcePath(cfg); + for (const auto& name : mVFS->getRecursiveDirectoryIterator("Fonts/")) + { + if (Misc::getFileExtension(name) == "omwfont") + MyGUI::ResourceManager::getInstance().load(name); + } + + dataManager->setUseVfs(false); } - typedef struct { float x; diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp index b01c5bbcf6..d3edb82ae5 100644 --- a/components/myguiplatform/myguidatamanager.cpp +++ b/components/myguiplatform/myguidatamanager.cpp @@ -18,8 +18,25 @@ void DataManager::setResourcePath(const std::string &path) mResourcePath = path; } +void DataManager::setUseVfs(bool useVfs) +{ + mUseVfs = useVfs; +} + MyGUI::IDataStream *DataManager::getData(const std::string &name) const { + if (mUseVfs) + { + // Note: MyGUI is supposed to read/free input steam itself, + // so copy data from VFS stream to the string stream and pass it to MyGUI. + Files::IStreamPtr streamPtr = mVfs->get(name); + std::istream* fileStream = streamPtr.get(); + std::unique_ptr dataStream; + dataStream.reset(new std::stringstream); + *dataStream << fileStream->rdbuf(); + return new MyGUI::DataStream(dataStream.release()); + } + std::string fullpath = getDataPath(name); auto stream = std::make_unique(); stream->open(fullpath, std::ios::binary); @@ -38,10 +55,17 @@ void DataManager::freeData(MyGUI::IDataStream *data) bool DataManager::isDataExist(const std::string &name) const { + if (mUseVfs) return mVfs->exists(name); + std::string fullpath = mResourcePath + "/" + name; return std::filesystem::exists(fullpath); } +void DataManager::setVfs(const VFS::Manager* vfs) +{ + mVfs = vfs; +} + const MyGUI::VectorString &DataManager::getDataListNames(const std::string &pattern) const { // TODO: pattern matching (unused?) @@ -53,6 +77,9 @@ const MyGUI::VectorString &DataManager::getDataListNames(const std::string &patt const std::string &DataManager::getDataPath(const std::string &name) const { + // FIXME: in theory, we should use the VFS here too, but it does not provide the real path to data files. + // In some cases there is no real path at all (when the requested MyGUI file is in BSA archive, for example). + // Currently it should not matter since we use this virtual function only to setup fonts for profilers. static std::string result; result.clear(); if (!isDataExist(name)) diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp index e0c4e6c436..a859ce99c1 100644 --- a/components/myguiplatform/myguidatamanager.hpp +++ b/components/myguiplatform/myguidatamanager.hpp @@ -5,6 +5,8 @@ #include +#include + namespace osgMyGUI { @@ -16,6 +18,10 @@ public: void setResourcePath(const std::string& path); + void setUseVfs(bool useVfs); + + void setVfs(const VFS::Manager* vfs); + /** Get data stream from specified resource name. @param _name Resource name (usually file name). */ @@ -44,6 +50,10 @@ public: private: std::string mResourcePath; + + const VFS::Manager* mVfs; + + bool mUseVfs{false}; }; } diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp index dfb2e6539d..b19bc722a2 100644 --- a/components/myguiplatform/myguiplatform.cpp +++ b/components/myguiplatform/myguiplatform.cpp @@ -30,7 +30,7 @@ Platform::~Platform() mLogFacility = nullptr; } -void Platform::initialise(const std::string &resourcePath, const std::string &_logName) +void Platform::initialise(const VFS::Manager* vfs, const std::string &resourcePath, const std::string &_logName) { if (!_logName.empty() && !mLogFacility) { @@ -39,6 +39,7 @@ void Platform::initialise(const std::string &resourcePath, const std::string &_l } mDataManager->setResourcePath(resourcePath); + mDataManager->setVfs(vfs); mRenderManager->initialise(); mDataManager->initialise(); diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp index 5ffbe0be70..a46fedcd75 100644 --- a/components/myguiplatform/myguiplatform.hpp +++ b/components/myguiplatform/myguiplatform.hpp @@ -3,6 +3,8 @@ #include +#include + namespace osgViewer { class Viewer; @@ -34,7 +36,7 @@ namespace osgMyGUI ~Platform(); - void initialise(const std::string& resourcePath, const std::string& _logName = "MyGUI.log"); + void initialise(const VFS::Manager* vfs, const std::string& resourcePath, const std::string& _logName = "MyGUI.log"); void shutdown(); diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp index 0ab523ab59..d578259033 100644 --- a/components/resource/stats.cpp +++ b/components/resource/stats.cpp @@ -15,6 +15,8 @@ #include +#include + namespace Resource { @@ -28,6 +30,8 @@ static bool collectStatFrameRate = false; static bool collectStatUpdate = false; static bool collectStatEngine = false; +inline static std::string sFontName = "Fonts\\DejaVuLGCSansMono.ttf"; + static void setupStatCollection() { const char* envList = getenv("OPENMW_OSG_STATS_LIST"); @@ -79,7 +83,7 @@ static void setupStatCollection() } } -StatsHandler::StatsHandler(bool offlineCollect): +StatsHandler::StatsHandler(bool offlineCollect, VFS::Manager* vfs): _key(osgGA::GUIEventAdapter::KEY_F4), _initialized(false), _statsType(false), @@ -96,15 +100,19 @@ StatsHandler::StatsHandler(bool offlineCollect): _resourceStatsChildNum = 0; - if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf")) - _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); + if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName)) + { + _font = vfs->getAbsoluteFileName(sFontName); + } } -Profiler::Profiler(bool offlineCollect): +Profiler::Profiler(bool offlineCollect, VFS::Manager* vfs): _offlineCollect(offlineCollect) { - if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf")) - _font = osgMyGUI::DataManager::getInstance().getDataPath("DejaVuLGCSansMono.ttf"); + if (osgDB::Registry::instance()->getReaderWriterForExtension("ttf") && vfs->exists(sFontName)) + { + _font = vfs->getAbsoluteFileName(sFontName); + } else _font.clear(); diff --git a/components/resource/stats.hpp b/components/resource/stats.hpp index 560275d701..b61280ceb1 100644 --- a/components/resource/stats.hpp +++ b/components/resource/stats.hpp @@ -13,12 +13,17 @@ namespace osg class Switch; } +namespace VFS +{ + class Manager; +} + namespace Resource { class Profiler : public osgViewer::StatsHandler { public: - Profiler(bool offlineCollect); + Profiler(bool offlineCollect, VFS::Manager* vfs); bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa) override; private: @@ -28,7 +33,7 @@ namespace Resource class StatsHandler : public osgGA::GUIEventHandler { public: - StatsHandler(bool offlineCollect); + StatsHandler(bool offlineCollect, VFS::Manager* vfs); void setKey(int key) { _key = key; } int getKey() const { return _key; } diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt index f476498494..1fa40b3f54 100644 --- a/files/data/CMakeLists.txt +++ b/files/data/CMakeLists.txt @@ -10,6 +10,16 @@ set(BUILTIN_DATA_FILES textures/omw_menu_scroll_center_h.dds textures/omw_menu_scroll_center_v.dds + fonts/DejaVuFontLicense.txt + fonts/DejaVuLGCSansMono.ttf + fonts/DejaVuLGCSansMono.omwfont + fonts/OMWAyembedt.ttf + fonts/OMWAyembedt.omwfont + fonts/OMWAyembedtFontLicense.txt + fonts/Pelagiad.ttf + fonts/Pelagiad.omwfont + fonts/PelagiadFontLicense.txt + l10n/Calendar/en.yaml l10n/Calendar/ru.yaml l10n/DebugMenu/en.yaml diff --git a/files/data/fonts/DejaVuFontLicense.txt b/files/data/fonts/DejaVuFontLicense.txt new file mode 100644 index 0000000000..254e2cc42a --- /dev/null +++ b/files/data/fonts/DejaVuFontLicense.txt @@ -0,0 +1,99 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +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 BITSTREAM OR THE GNOME +FOUNDATION 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. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +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 +TAVMJONG BAH 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. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $ diff --git a/files/mygui/openmw_font.xml b/files/data/fonts/DejaVuLGCSansMono.omwfont similarity index 89% rename from files/mygui/openmw_font.xml rename to files/data/fonts/DejaVuLGCSansMono.omwfont index 6ffe3017e5..6511877656 100644 --- a/files/mygui/openmw_font.xml +++ b/files/data/fonts/DejaVuLGCSansMono.omwfont @@ -1,7 +1,7 @@ - + diff --git a/files/mygui/DejaVuLGCSansMono.ttf b/files/data/fonts/DejaVuLGCSansMono.ttf similarity index 100% rename from files/mygui/DejaVuLGCSansMono.ttf rename to files/data/fonts/DejaVuLGCSansMono.ttf diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/OMWAyembedt.omwfont new file mode 100644 index 0000000000..c8ac1c2ecb --- /dev/null +++ b/files/data/fonts/OMWAyembedt.omwfont @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/files/data/fonts/OMWAyembedt.ttf b/files/data/fonts/OMWAyembedt.ttf new file mode 100644 index 0000000000..fb889b17fc Binary files /dev/null and b/files/data/fonts/OMWAyembedt.ttf differ diff --git a/files/data/fonts/OMWAyembedtFontLicense.txt b/files/data/fonts/OMWAyembedtFontLicense.txt new file mode 100644 index 0000000000..47986d5463 --- /dev/null +++ b/files/data/fonts/OMWAyembedtFontLicense.txt @@ -0,0 +1,94 @@ +Copyright (c) 2014, Georg Duffner (https://github.com/georgd/OpenMW-Fonts), +with Reserved Font Name "OMWAyembedt.ttf". + +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. diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/Pelagiad.omwfont new file mode 100644 index 0000000000..38dc29e09d --- /dev/null +++ b/files/data/fonts/Pelagiad.omwfont @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/data/fonts/Pelagiad.ttf b/files/data/fonts/Pelagiad.ttf new file mode 100644 index 0000000000..07653b0530 Binary files /dev/null and b/files/data/fonts/Pelagiad.ttf differ diff --git a/files/data/fonts/PelagiadFontLicense.txt b/files/data/fonts/PelagiadFontLicense.txt new file mode 100644 index 0000000000..2d4aff5cdd --- /dev/null +++ b/files/data/fonts/PelagiadFontLicense.txt @@ -0,0 +1,94 @@ +Copyright (c) 2015, Isak Larborn (isaskar.github.io/Pelagiad|Isaskar@users.noreply.github.com), +with Reserved Font Name "Pelagiad.ttf". + +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. diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index 924aaecada..4716a7712b 100644 --- a/files/mygui/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -32,7 +32,6 @@ set(MYGUI_FILES openmw_dialogue_window.layout openmw_dialogue_window.skin.xml openmw_edit.skin.xml - openmw_font.xml openmw_hud_box.skin.xml openmw_hud_energybar.skin.xml openmw_hud.layout @@ -93,7 +92,6 @@ set(MYGUI_FILES openmw_postprocessor_hud.layout openmw_postprocessor_hud.skin.xml openmw_jail_screen.layout - DejaVuLGCSansMono.ttf ../launcher/images/openmw.png OpenMWResourcePlugin.xml skins.xml diff --git a/files/mygui/skins.xml b/files/mygui/skins.xml index 4d3d4c8774..d8d0b4b542 100644 --- a/files/mygui/skins.xml +++ b/files/mygui/skins.xml @@ -3,7 +3,6 @@ -