scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD ...

Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp

2015-11-13 01:34:36 +01:00

..

bsa

Remove strings.h wrapper

2015-05-10 00:36:04 +02:00

compiler

fixed an interference with script warning mode and error downgrading (Fixes #2990)

2015-11-09 09:07:18 +01:00

config

Fix attempt to erase using a const_iterator.

2015-06-15 10:26:16 +10:00

contentselector

Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644.

2015-06-16 12:48:45 +10:00

esm

Merge commit 'pull/upstream/678' into HEAD

2015-11-13 01:34:36 +01:00

esmterrain

Terrain: remove debug code

2015-11-06 20:21:39 +01:00

files

Fixes for building with unity build

2015-09-24 15:21:42 +02:00

fontloader

Build fix for MyGUI 3.2.1

2015-06-04 17:13:42 +02:00

interpreter

deal with script execution from within a script (Fixes #2964)

2015-10-09 12:14:56 +02:00

loadinglistener

Show wallpaper when loading a savegame

2014-06-02 23:26:43 +02:00

misc

Add back resource handling workarounds to the gui code

2015-05-01 18:37:24 +02:00

myguiplatform

Update scalinglayer.cpp

2015-11-10 14:59:26 +01:00

nif

Read NiSpotLight

2015-11-12 23:45:12 +01:00

nifbullet

Include cleanup

2015-07-25 02:11:49 +02:00

nifosg

NifOsg::Emitter: ignore psToWorld scale

2015-11-13 00:23:00 +01:00

process

OSX build fix

2014-11-20 18:14:49 +01:00

resource

Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)

2015-11-10 18:28:58 +01:00

sceneutil

Use OSG_VERSION_GREATER_EQUAL / LESS_THAN rather than MIN_VERSION_REQUIRED (cosmetic change)

2015-11-10 18:28:58 +01:00

sdlutil

GraphicsWindowSDL2: adjust the log levels

2015-11-10 18:42:59 +01:00

settings

Remove dependency on Ogre::StringConverter

2015-06-03 19:59:54 +02:00

terrain

Terrain: restore IncrementalCompileOperation

2015-11-06 20:22:07 +01:00

to_utf8

Remove some outdated todo comments

2015-03-12 00:27:01 +01:00

translation

Fix cppcheck issues

2014-09-26 17:48:14 +02:00

version

Move OpenMW version information to a textfile instead of compiling it in

2015-07-18 03:09:04 +02:00

vfs

Fixes for building with unity build

2015-09-24 15:21:42 +02:00

widgets

Fix -Woverloaded-virtual clang warnings

2015-06-04 20:31:28 +02:00

CMakeLists.txt

Implement ScalingLayer, for layouting of widgets in screen-relative coordinates

2015-11-08 18:30:21 +01:00

doc.hpp

second set of additional doxygen comments

2010-09-25 20:15:05 +02:00