Marc Zinnschlag 11e254aac8 Merge remote-tracking branch 'gus/AICombat' ...

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

2013-11-19 09:10:48 +01:00

..

dialoguemanager.hpp

Say something from the "hit" dialog topic when losing health

2013-07-24 10:02:50 -07:00

environment.cpp

Removed a workaround from Renderer, some cleanup

2013-10-30 13:05:28 +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/AICombat'

2013-11-19 09:10:48 +01:00

scriptmanager.hpp

Added new game button

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

soundmanager.hpp

Avoid a hack to play the underwater sound properly

2013-08-27 13:26:57 -07:00

windowmanager.hpp

Refactored loading screen

2013-08-27 15:48:13 +02:00

world.hpp

Merge remote-tracking branch 'gus/AICombat'

2013-11-19 09:10:48 +01:00