scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/model/doc/documentmanager.cpp components/CMakeLists.txt components/bsa/resources.cpp components/nif/data.hpp components/nif/node.cpp components/nifogre/mesh.hpp components/nifogre/ogrenifloader.cpp components/nifogre/particles.cpp		2015-03-27 17:30:48 +01:00
..
BtOgre.cpp	Fixed more MSVC 2013 warnings.	2015-03-15 08:49:03 +13:00
BtOgreExtras.h	Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.	2014-11-06 08:35:24 +11:00
BtOgreGP.h	Fixed more MSVC 2013 warnings.	2015-03-15 08:49:03 +13:00
BtOgrePG.h	Get rid of underscore defines. They are reserved by the standard.	2014-01-05 18:22:29 +01:00
BulletShapeLoader.cpp	Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.	2015-03-14 19:41:55 +11:00
BulletShapeLoader.h	Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.	2015-03-14 19:41:55 +11:00
physic.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-03-27 17:30:48 +01:00
physic.hpp	Remove some outdated todo comments	2015-03-12 00:27:01 +01:00
trace.cpp	Ignore other actors in ActorTracer::findGround (Fixes #1472)	2014-10-03 15:37:32 +02:00
trace.h	Implement collision script instructions (Fixes #1111)	2014-07-29 19:01:40 +02:00