You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Cernat ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/actors.cpp		7 years ago
..
dialoguemanager.hpp	Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts	7 years ago
environment.cpp	Respect the framelimit in all cases (Fixes #3531)	7 years ago
environment.hpp	Respect the framelimit in all cases (Fixes #3531)	7 years ago
inputmanager.hpp	Save controls state (Fixes #3598)	8 years ago
journal.hpp	[Client] Only send PlayerJournal packets for new journal entries	8 years ago
mechanicsmanager.hpp	Merge pull request #349 from OpenMW/master	7 years ago
scriptmanager.hpp	added missing const to ScriptManager::getLocals	11 years ago
soundmanager.hpp	Remove a function from the sound manager interface	7 years ago
statemanager.hpp	Make the creation of save file directories even more explicit	9 years ago
windowmanager.hpp	Merge pull request #395 from OpenMW/master while resolving conflicts	7 years ago
world.hpp	Merge pull request #395 from OpenMW/master while resolving conflicts	7 years ago