mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:53:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into mouse-picking-physics

Browse source
This commit is contained in:
cc9cii 2014-11-06 09:46:48 +11:00
commit bf669a51c1
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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 "")

1
apps/opencs/view/render/cell.hpp
View file

@ -3,6 +3,7 @@
#include <string>
#include <map>
#include <memory>
#include <OgreVector3.h>

2
apps/opencs/view/render/textoverlay.cpp
View file

@ -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<uint8_t*>(pixelBox.data);
Ogre::uint8* pDest = static_cast<Ogre::uint8*>(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.

8
readme.txt
View file

@ -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
@ -197,14 +201,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