viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp

2016-02-10 14:13:08 +01:00

..

Collision.h

Merge remote-tracking branch 'origin/master' into Animations

2016-02-10 14:13:08 +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

FillFrustumOctreeSystem.h

FrustumOctree has its own system, won't cull away explosion effects.

2016-02-10 10:53:25 +01:00

FillOctreeSystem.h

FrustumOctree has its own system, won't cull away explosion effects.

2016-02-10 10:53:25 +01:00

TriggerSystem.h

Made TriggerSystem make use of Octree

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