Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp		2012-07-17 10:57:15 -07:00
..
mwbase	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
mwclass	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
mwdialogue	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
mwgui	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
mwinput	DrawState workaround	2012-07-07 20:53:19 +02:00
mwmechanics	avoid locking up in case actor updates repeatedly throw exceptions	2012-07-17 18:37:20 +02:00
mwrender	Merge remote branch 'zini/master' into nif-cleanup	2012-07-17 10:57:15 -07:00
mwscript	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
mwsound	Include soundmanager.hpp for Play_Normal enum	2012-07-16 23:54:24 +04:00
mwworld	fixed a logic error in the auto equip code	2012-07-17 18:35:01 +02:00
CMakeLists.txt	Merge branch 'master' into potions	2012-07-17 10:32:18 +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 remote branch 'zini/master' into nif-cleanup	2012-07-17 10:57:15 -07:00
engine.hpp	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
main.cpp	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00