David Cernat ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwmechanics/actors.cpp		2018-03-29 07:28:30 +03:00
..
actor.cpp	Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51	2017-08-31 21:58:12 +00:00
actor.hpp	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
collisiontype.hpp	Use a separate collision type for doors (Fixes #1962)	2015-12-18 18:32:42 +01:00
convert.hpp	Readded collision objects and movement physics	2015-05-12 03:02:15 +02:00
physicssystem.cpp	Merge pull request #395 from OpenMW/master while resolving conflicts	2018-03-29 07:28:30 +03:00
physicssystem.hpp	[General] Implement setting of physics framerate as part of GameSettings	2018-02-14 05:53:44 +02:00
trace.cpp	traceDown fix	2017-02-11 17:53:11 +01:00
trace.h	Use tracer hit height to skip stepping up in movement solver.	2016-12-24 23:07:44 +01:00