gugus 03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp		2012-07-09 10:39:57 +02:00
..
btKinematicCharacterController.cpp	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
btKinematicCharacterController.h	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
BtOgre.cpp	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
BtOgreExtras.h	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
BtOgreGP.h	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
BtOgrePG.h	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
BulletShapeLoader.cpp	ogre 1.8 fixes	2012-03-28 21:30:59 +02:00
BulletShapeLoader.h	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
CMotionState.cpp	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
CMotionState.h	Merged openengine into openmw	2012-03-11 18:16:29 +04:00
physic.cpp	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-07-09 10:39:57 +02:00
physic.hpp	fix compilation against latest bullet svn	2012-06-20 18:22:18 +02:00
pmove.cpp	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling	2012-06-16 11:38:07 +02:00
pmove.h	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-07-09 10:39:57 +02:00
trace.cpp	Merge branch 'master' into physicsaedra2 & fix warnings	2012-04-30 18:46:51 +02:00
trace.h	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00