Marc Zinnschlag fd5486864a Merge remote-tracking branch 'gus/AIFix2' ...

Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp

2014-01-28 12:33:31 +01:00

..

dialoguemanager.hpp

Fix disposition changes from trades not applying properly

2014-01-08 01:46:42 +01:00

environment.cpp

Integrate AddGlow with material controllers

2013-12-26 20:53:45 +01:00

environment.hpp

Removed a workaround from Renderer, some cleanup

2013-10-30 13:05:28 +01:00

inputmanager.hpp

loading screen

2012-09-11 16:37:54 +02:00

journal.hpp

Added new game button

2013-05-15 17:54:18 +02:00

mechanicsmanager.hpp

Merge remote-tracking branch 'gus/AIFix2'

2014-01-28 12:33:31 +01:00

scriptmanager.hpp

Added new game button

2013-05-15 17:54:18 +02:00

soundmanager.hpp

Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.

2014-01-20 12:05:13 +01:00

windowmanager.hpp

Rewrite some awful code

2014-01-11 00:24:21 +01:00

world.hpp

Feature #957: Handle area effects for "on touch" range

2014-01-21 12:30:15 +01:00