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-tes3mp/apps/openmw/mwbase
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
..
dialoguemanager.hpp Merge pull request #469 from davidcernat/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 [General] Add optional timestamps to journal entries in PlayerJournal 7 years ago
mechanicsmanager.hpp [Client] Make it possible to check if an item ID belongs to a bound item 6 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 Add resumeGame method 7 years ago
windowmanager.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 7 years ago
world.hpp Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago