Marc Zinnschlag a445683312 Merge branch 'mergetool' ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp

2015-09-11 13:22:15 +02:00

..

actor.cpp

Use a btCollisionWorld instead of btDiscreteDynamicsWorld

2015-05-27 23:09:38 +02:00

actor.hpp

Use a btCollisionWorld instead of btDiscreteDynamicsWorld

2015-05-27 23:09:38 +02:00

collisiontype.hpp

Readded collision objects and movement physics

2015-05-12 03:02:15 +02:00

convert.hpp

Readded collision objects and movement physics

2015-05-12 03:02:15 +02:00

physicssystem.cpp

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00

physicssystem.hpp

more const-ness fixes

2015-08-31 16:08:19 +02:00

trace.cpp

Use a btCollisionWorld instead of btDiscreteDynamicsWorld

2015-05-27 23:09:38 +02:00

trace.h

Use a btCollisionWorld instead of btDiscreteDynamicsWorld

2015-05-27 23:09:38 +02:00