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
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
	apps/opencs/view/render/instancemode.cpp
9 years ago
..
dialoguemanager.hpp Several warning fixes 10 years ago
environment.cpp Remove empty line at the beginning of files 10 years ago
environment.hpp Include cleanup 10 years ago
inputmanager.hpp Stop rendering when the window is minimized 9 years ago
journal.hpp Accept an implicit reference in Journal (Fixes #3135) 9 years ago
mechanicsmanager.hpp Move werewolf functions from World to MechanicsManager 9 years ago
scriptmanager.hpp added missing const to ScriptManager::getLocals 11 years ago
soundmanager.hpp Use a ConstPtr in SoundManager 9 years ago
statemanager.hpp Add commandline option to load a save game on startup 10 years ago
windowmanager.hpp Remove old FPS setting code 9 years ago
world.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 9 years ago