David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts ... # Conflicts: # apps/openmw/main.cpp # apps/openmw/mwbase/world.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwscript/dialogueextensions.cpp # apps/openmw/mwworld/worldimp.hpp		2018-08-20 14:08:44 +03:00
..
dialoguemanager.hpp	Merge pull request #469 from davidcernat/master while resolving conflicts	2018-08-20 14:08:44 +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	[General] Add optional timestamps to journal entries in PlayerJournal	2018-07-26 04:36:12 +03:00
mechanicsmanager.hpp	[Client] Make it possible to check if an item ID belongs to a bound item	2018-08-11 16:02:09 +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	Add resumeGame method	2018-07-26 20:35:34 +03:00
windowmanager.hpp	Merge pull request #457 from OpenMW/master while resolving conflicts	2018-07-14 03:57:05 +03:00
world.hpp	Merge pull request #469 from davidcernat/master while resolving conflicts	2018-08-20 14:08:44 +03:00