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

..

mwbase

Rotations: remove LocalRotation

2015-11-12 01:16:37 +01:00

mwclass

Rotations: move doors via Rotation rather than LocalRotation

2015-11-12 00:58:29 +01:00

mwdialogue

Update the dialogue topic list after running greeting script

2015-10-18 21:40:16 +02:00

mwgui

Restore the previous key focus widget after playing video

2015-11-12 19:03:24 +01:00

mwinput

Fix tab indentations in apps/ and components/

2015-09-16 20:45:37 +02:00

mwmechanics

Rotations: World::rotateObject takes radians instead of degrees

2015-11-12 01:09:39 +01:00

mwphysics

Dead actors underwater will float to the surface

2015-11-08 20:58:00 +01:00

mwrender

Remove a stray method declaration

2015-11-11 17:24:27 +01:00

mwscript

improves InterpreterContext::updatePtr

2015-11-12 17:53:17 +01:00

mwsound

extracted MWMechanics::getPlayer()

2015-08-21 21:12:39 +12:00

mwstate

Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'

2015-08-23 12:11:30 +02:00

mwworld

Merge commit 'pull/upstream/678' into HEAD

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

android_commandLine.cpp

Fix tab indentations in apps/ and components/

2015-09-16 20:45:37 +02:00

android_commandLine.h

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

android_main.c

Fix tab indentations in apps/ and components/

2015-09-16 20:45:37 +02:00

CMakeLists.txt

Fixes for building with unity build

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

crashcatcher.cpp

Fix tab indentations in apps/ and components/

2015-09-16 20:45:37 +02:00

doc.hpp

doc.hpp fix

2015-06-04 01:30:16 +02:00

engine.cpp

Remove old FPS setting code

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

engine.hpp

Fix the Viewer's FrameStamp not being set correctly during Engine::frame

2015-06-14 15:28:22 +02:00

main.cpp

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

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