gus 707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 ... Conflicts: apps/openmw/mwmechanics/aifollow.cpp		2014-01-24 19:16:50 +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 branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2	2014-01-24 19:16:50 +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	Rewrite some awful code	2014-01-11 00:24:21 +01:00
world.hpp	Closes #1086: Implement blood effects	2014-01-17 11:27:13 +01:00