Merge remote-tracking branch 'scrawl/openmw-27'

CMakeLists.txt

@@ -19,7 +19,7 @@ include (OpenMWMacros)
 # Version
 
 set (OPENMW_VERSION_MAJOR 0)
-set (OPENMW_VERSION_MINOR 26)
+set (OPENMW_VERSION_MINOR 27)
 set (OPENMW_VERSION_RELEASE 0)
 
 set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")

Daedric Font License.txt

@@ -1,10 +0,0 @@
-Dongle's Oblivion Daedric font set
-http://www.uesp.net/wiki/Lore:Daedric_Alphabet#Daedric_Font
-
----------------------------------------------------
-
-This was done entirely as a personal project. Bethesda Softworks graciously granted me the permission for it. I am not connected with them in any way.
-You may freely use these fonts to create anything you'd like. You may re-distribute the fonts freely, over the Internet, or by any other means. Always keep the .zip file intact, and this read me included.
-Please do not modify and redistribute the fonts without my permission.
-You may NOT sell any of these fonts under any circumstances. This includes putting them on compilation font CDs for sale, putting them in a "members only" pay-area of a website, or any other means of financial gain connected in ANY way with the redistribution of any of these fonts.
-You have my permission to create and sell any artwork made with these fonts, however you may need to contact Bethesda Softworks before doing so.

apps/openmw/engine.cpp

@@ -369,7 +369,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     addResourcesDirectory(mResDir / "mygui");
     addResourcesDirectory(mResDir / "water");
     addResourcesDirectory(mResDir / "shadows");
-    addZipResource(mResDir / "mygui" / "Obliviontt.zip");
 
     OEngine::Render::WindowSettings windowSettings;
     windowSettings.fullscreen = settings.getBool("fullscreen", "Video");

files/mygui/CMakeLists.txt

@@ -9,7 +9,6 @@ set(MYGUI_FILES
     core.skin
     core.xml
     EBGaramond-Regular.ttf
-    Obliviontt.zip
     openmw_alchemy_window.layout
     openmw_book.layout
     openmw_box.skin.xml

readme.txt

@@ -3,7 +3,7 @@ OpenMW: A reimplementation of The Elder Scrolls III: Morrowind
 OpenMW is an attempt at recreating the engine for the popular role-playing game
 Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 
-Version: 0.26.0
+Version: 0.27.0
 License: GPL (see GPL3.txt for more information)
 Website: http://www.openmw.org