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.cpp

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

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

CollisionSystem.cpp

Merge fixes

2016-02-10 13:44:47 +01:00

FillFrustumOctreeSystem.cpp

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

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

FillOctreeSystem.cpp

Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned.

2016-02-09 19:20:04 +01:00

TriggerSystem.cpp

Models/Collideables/etc. won't need a AABB component anymore, if it has a Model component. In addition, they should take rotation into account, i.e it doesn't have to be axis-aligned.

2016-02-09 19:20:04 +01:00