David Cernat fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/combat.cpp		2017-01-18 15:38:18 +02:00
..
dialoguemanager.hpp	Several warning fixes	2015-01-23 15:34:47 +01:00
environment.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
environment.hpp	Include cleanup	2015-02-05 04:18:42 +01:00
inputmanager.hpp	Save controls state (Fixes #3598)	2016-10-20 02:12:01 +02:00
journal.hpp	Accept an implicit reference in Journal (Fixes #3135)	2016-01-11 23:07:01 +01:00
mechanicsmanager.hpp	Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith	2016-12-20 12:38:51 +01:00
scriptmanager.hpp	added missing const to ScriptManager::getLocals	2014-07-25 08:12:53 +02:00
soundmanager.hpp	Use a ConstPtr in SoundManager	2015-12-18 18:11:30 +01:00
statemanager.hpp	Make the creation of save file directories even more explicit	2016-03-14 00:00:11 +01:00
windowmanager.hpp	Fixed multiple spelling mistakes	2016-12-14 16:39:33 +01:00
world.hpp	Merge pull request #128 from OpenMW/master while resolving conflicts	2017-01-18 15:38:18 +02:00