David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		2017-06-18 18:16:10 +03:00
..
dialoguemanager.hpp	[Client] Update topics in current dialogue screen when receiving PlayerTopic packets	2017-05-31 06:51:50 +03: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	[Client] Only send PlayerJournal packets for new journal entries	2017-05-27 22:49:11 +03:00
mechanicsmanager.hpp	[General] Implement PlayerKillCount packets	2017-06-10 14:04:19 +03:00
scriptmanager.hpp	added missing const to ScriptManager::getLocals	2014-07-25 08:12:53 +02:00
soundmanager.hpp	purge all instances of <boost/shared_ptr.hpp>, clean up unused headers	2017-06-09 19:08:53 +02:00
statemanager.hpp	Make the creation of save file directories even more explicit	2016-03-14 00:00:11 +01:00
windowmanager.hpp	Preload magic effect visuals of the player's selected weapon/spell	2017-02-15 21:01:25 +01:00
world.hpp	Merge pull request #228 from OpenMW/master while resolving conflicts	2017-06-18 18:16:10 +03:00