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

# Conflicts:
#	include/Engine/Collision/CollisionSystem.h
#	src/Engine/Collision/CollisionSystem.cpp

2016-02-01 13:48:05 +01:00

..

CollidableOctreeSystem.h

Made TriggerSystem make use of Octree

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

Collision.h

Merge branch 'master' into BoxModelCollision

2016-02-01 13:48:05 +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