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

# Conflicts: # src/Game/Systems/SoundSystem.cpp
2016-02-10 19:21:30 +01:00
parent 2c0f66d9c7 ed06eacf6f
commit 0825b10c75
7 changed files with 55 additions and 20 deletions
@@ -79,7 +79,8 @@ bool AABBVsAABB(const AABB& a, const AABB& b);
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);

 // Calculates an absolute AABB from an entity AABB component
-boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity);
+boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
+boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);

 }