scrawl 75dd651205 Merge branch 'terraincollision' into physicsterrain ...

Conflicts:
	apps/openmw/mwworld/physicssystem.cpp

2012-04-09 13:56:09 +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

Merged openengine into openmw

2012-03-11 18:16:29 +04:00

BtOgreExtras.h

Merged openengine into openmw

2012-03-11 18:16:29 +04:00

BtOgreGP.h

Merged openengine into openmw

2012-03-11 18:16:29 +04: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

Merged openengine into openmw

2012-03-11 18:16:29 +04:00

CMotionState.h

Merged openengine into openmw

2012-03-11 18:16:29 +04:00

physic.cpp

Merge branch 'terraincollision' into physicsterrain

2012-04-09 13:56:09 +02:00

physic.hpp

Merge branch 'master' into terraincollision

2012-04-02 19:57:58 +02:00

pmove.cpp

made it compile

2012-04-08 18:25:50 +02:00

pmove.h

Awesome, working

2012-03-27 20:17:54 -04:00

trace.cpp

Awesome, working

2012-03-27 20:17:54 -04:00

trace.h

made it compile

2012-04-08 18:25:50 +02:00