William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-05 14:59:14 +01:00

..

CollidableOctreeSystem.h

Several changes/fixes based on the latest broken refactoring.

2016-02-02 11:37:22 +01:00

Collision.h

Can walk up "stair-steps". Cleanup WIP.

2016-02-05 10:56:34 +01:00

CollisionSystem.h

Made CollisionSystem aware of entities

2016-01-27 15:42:50 +01:00

EntityAABB.h

Made TriggerSystem make use of Octree

2016-01-27 13:35:16 +01:00

ETrigger.h

Made TriggerSystem make use of Octree

2016-01-27 13:35:16 +01:00

TriggerSystem.h

Made TriggerSystem make use of Octree

2016-01-27 13:35:16 +01:00