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 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
..
dialoguemanager.hpp Added new game button 12 years ago
environment.cpp change destruction order to fix crash on exit when a video is playing 12 years ago
environment.hpp Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
inputmanager.hpp loading screen 12 years ago
journal.hpp Added new game button 12 years ago
mechanicsmanager.hpp Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 12 years ago
scriptmanager.hpp Added new game button 12 years ago
soundmanager.hpp Use const references where appropriate 12 years ago
windowmanager.hpp Merge branch 'master' into HEAD 12 years ago
world.hpp Sell owned items in the cell 12 years ago