David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # README.md # apps/openmw/mwgui/quickkeysmenu.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/combat.cpp		2018-07-04 01:52:29 +03:00
..
dialoguemanager.hpp	Merge pull request #400 from OpenMW/master while resolving conflicts	2018-04-03 01:25:17 +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 #447 from OpenMW/master while resolving conflicts	2018-06-08 06:01:00 +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 #426 from OpenMW/master	2018-05-15 21:01:33 +03:00
world.hpp	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00