From 2fa44c3c5f944836f229c4cc3c76b4e826a9193a Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Fri, 24 Oct 2014 09:30:48 +0200 Subject: [PATCH 1/4] removed two issues from the changelog that did not make it into the release --- readme.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/readme.txt b/readme.txt index 254e60f7f..cb533e9fb 100644 --- a/readme.txt +++ b/readme.txt @@ -197,14 +197,12 @@ Bug #2029: Ienith Brothers Thiev's Guild quest journal entry not adding Feature #471: Editor: Special case implementation for top-level window with single sub-window Feature #472: Editor: Sub-Window re-use settings Feature #704: Font colors import from fallback settings -Feature #854: Editor: Add user setting to show status bar Feature #879: Editor: Open sub-views in a new top-level window Feature #932: Editor: magic effect table Feature #937: Editor: Path Grid table Feature #938: Editor: Sound Gen table Feature #1117: Death and LevelUp music Feature #1226: Editor: Request UniversalId editing from table columns -Feature #1310: Editor: Rendering User Settings Feature #1545: Targeting console on player Feature #1597: Editor: Render terrain Feature #1695: Editor: add column for CellRef's global variable From ba3d2be8e31a52f97f87f9cb5a5a8cb4890513c0 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 5 Nov 2014 19:45:32 +0100 Subject: [PATCH 2/4] Add missing include (Fixes #2108) --- apps/opencs/view/render/cell.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp index e63e09520..67117bfc3 100644 --- a/apps/opencs/view/render/cell.hpp +++ b/apps/opencs/view/render/cell.hpp @@ -3,6 +3,7 @@ #include #include +#include #include From 6b88f5f33edc4abd1e3b6f1c211ad867503c7126 Mon Sep 17 00:00:00 2001 From: scrawl Date: Wed, 5 Nov 2014 20:58:49 +0100 Subject: [PATCH 3/4] Use Ogre::uint8, fixes a missing include for uint8_t --- apps/opencs/view/render/textoverlay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/opencs/view/render/textoverlay.cpp b/apps/opencs/view/render/textoverlay.cpp index 12831be9a..656ea959c 100644 --- a/apps/opencs/view/render/textoverlay.cpp +++ b/apps/opencs/view/render/textoverlay.cpp @@ -79,7 +79,7 @@ TextOverlay::TextOverlay(const Ogre::MovableObject* obj, const Ogre::Camera* cam pixelBuffer->lock(Ogre::HardwareBuffer::HBL_NORMAL); const Ogre::PixelBox& pixelBox = pixelBuffer->getCurrentLock(); - uint8_t* pDest = static_cast(pixelBox.data); + Ogre::uint8* pDest = static_cast(pixelBox.data); // Fill in some pixel data. This will give a semi-transparent blue, // but this is of course dependent on the chosen pixel format. From 5909fa4368aec785e2d09a9e807936ea520d624f Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Wed, 5 Nov 2014 21:18:43 +0100 Subject: [PATCH 4/4] new version number and updated changelog --- CMakeLists.txt | 2 +- readme.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4efb19719..b3ec6cf6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ message(STATUS "Configuring OpenMW...") set(OPENMW_VERSION_MAJOR 0) set(OPENMW_VERSION_MINOR 33) -set(OPENMW_VERSION_RELEASE 0) +set(OPENMW_VERSION_RELEASE 1) set(OPENMW_VERSION_COMMITHASH "") set(OPENMW_VERSION_TAGHASH "") diff --git a/readme.txt b/readme.txt index cb533e9fb..810a0e055 100644 --- a/readme.txt +++ b/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.33.0 +Version: 0.33.1 License: GPL (see GPL3.txt for more information) Website: http://www.openmw.org @@ -98,6 +98,10 @@ Allowed options: CHANGELOG +0.33.1 + +Bug #2108: OpenCS fails to build + 0.33.0 Bug #371: If console assigned to ` (probably to any symbolic key), "`" symbol will be added to console every time it closed