scrawl f1b138d0a8 Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt		2013-01-07 13:25:15 +01:00
..
dialoguemanager.hpp	Merge branch 'master' into dialogue	2012-11-10 15:44:44 +01:00
environment.cpp	change destruction order to fix crash on exit when a video is playing	2012-12-15 22:01:45 +01:00
environment.hpp
inputmanager.hpp
journal.hpp
mechanicsmanager.hpp	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
scriptmanager.hpp
soundmanager.hpp	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00
windowmanager.hpp	1. Dialogs in Russian version now works.	2012-12-31 04:15:47 +04:00
world.hpp	Merge branch 'master' into videoplayback	2013-01-07 13:25:15 +01:00