Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics

This commit is contained in:
viktorljung
2015-10-08 23:53:59 +02:00
6 changed files with 112 additions and 4 deletions
+1
View File
@@ -129,6 +129,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
}
}
if (ballComponent->Sticky) {
//TODO - Ball can stick to same pad just after detaching.
if (!m_Waiting)
{
auto transform = m_World->GetComponent<Components::Transform>(entity);