David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp		2017-10-06 04:10:04 +03:00
..
dialoguemanager.hpp	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
environment.cpp	Respect the framelimit in all cases (Fixes #3531)	2017-08-30 21:26:30 +00:00
environment.hpp	Respect the framelimit in all cases (Fixes #3531)	2017-08-30 21:26:30 +00:00
inputmanager.hpp	Save controls state (Fixes #3598)	2016-10-20 02:12:01 +02:00
journal.hpp	[Client] Only send PlayerJournal packets for new journal entries	2017-05-27 22:49:11 +03:00
mechanicsmanager.hpp	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
scriptmanager.hpp	added missing const to ScriptManager::getLocals	2014-07-25 08:12:53 +02:00
soundmanager.hpp	Remove a function from the sound manager interface	2017-09-18 01:28:39 -07:00
statemanager.hpp	Make the creation of save file directories even more explicit	2016-03-14 00:00:11 +01:00
windowmanager.hpp	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
world.hpp	Merge pull request #298 from OpenMW/master	2017-09-26 21:54:55 +03:00