scrawl 75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 ...

Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp

2012-04-18 13:43:15 +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 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2

2012-04-18 13:43:15 +02:00

physic.hpp

Merge branch 'master' into terraincollision

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

pmove.cpp

Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2

2012-04-18 13:43:15 +02:00

pmove.h

Better no clip

2012-04-17 20:31:36 -04:00

trace.cpp

Preparing for clothes/armor

2012-04-02 22:08:46 -04:00

trace.h

made it compile

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