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.
openmw-tes3coop/apps/openmw/mwbase
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
..
dialoguemanager.hpp Merge pull request #400 from OpenMW/master while resolving conflicts 6 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 7 years ago
mechanicsmanager.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
scriptmanager.hpp added missing const to ScriptManager::getLocals 10 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 8 years ago
windowmanager.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
world.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago