scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ...

Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt

2015-06-13 21:11:24 +02:00

..

bsa

Remove strings.h wrapper

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

compiler

Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591)

2015-06-02 14:43:38 +02:00

config

Remove unnecessary comment entry in the config file.

2015-06-10 08:23:38 +10:00

contentselector

Remove unused code

2015-06-12 01:58:13 +02:00

esm

Remove last remains of Ogre

2015-06-03 23:04:35 +02:00

esmterrain

Build fix

2015-06-05 16:56:38 +02:00

files

Remove dependency on OgrePlatform.h

2015-06-03 18:49:52 +02:00

fontloader

Build fix for MyGUI 3.2.1

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

interpreter

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-23 20:33:44 +02:00

loadinglistener

…

misc

Add back resource handling workarounds to the gui code

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

myguiplatform

Fix crash when OSG_STEREO is enabled

2015-06-08 03:26:36 +02:00

nif

Fix error handling for out-of-range NIF roots (found in Bosmora, TR)

2015-06-09 18:22:18 +02:00

nifbullet

Minor cleanup

2015-06-11 18:01:00 +02:00

nifosg

Assign an initial bounding box to particle systems

2015-06-11 02:37:49 +02:00

process

…

resource

Assign an initial bounding box to particle systems

2015-06-11 02:37:49 +02:00

sceneutil

Revert "Use the WorkQueue to update skinning"

2015-06-10 19:08:56 +02:00

sdlutil

Throw error when failing to create graphics context

2015-06-10 18:46:51 +02:00

settings

Remove dependency on Ogre::StringConverter

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

terrain

Add a comment

2015-06-09 03:16:41 +02:00

to_utf8

Remove some outdated todo comments

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

translation

…

version

…

vfs

Include fix

2015-06-08 01:14:26 +02:00

widgets

Fix -Woverloaded-virtual clang warnings

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

CMakeLists.txt

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-13 21:11:24 +02:00

doc.hpp

…