openmw-tes3coop/apps/openmw
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
2013-06-12 12:34:33 +02:00
..
mwbase Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
mwclass Implement movement for creatures (formula is a stub) 2013-05-27 18:03:06 +02:00
mwdialogue Added new game button 2013-05-15 17:54:18 +02:00
mwgui Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
mwinput Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
mwmechanics Fix being able to move slowly when over encumbered 2013-05-31 04:08:44 +02:00
mwrender Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
mwscript minor adjustments 2013-05-24 15:03:46 +02:00
mwsound libc++ fixes: avcodec/avformat workaround 2013-05-26 12:01:01 +02:00
mwworld Sell owned items in the cell 2013-05-27 02:18:36 +02:00
CMakeLists.txt Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
config.hpp.cmake another minor correction (fixing the previous one) 2011-07-08 16:16:06 +02:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00
engine.cpp Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
engine.hpp Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
main.cpp Some fixes 2013-05-15 22:38:53 +02:00