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

Conflicts: include/Core/Engine.h src/game/Physics/PhysicsSystem.cpp
2015-09-14 15:37:38 +01:00
parent c7704f62e9 1b9da2de1b
commit dfef1ec774
53 changed files with 807 additions and 92 deletions
@@ -80,8 +80,6 @@ private:
            e.Entity1 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureA()->GetBody()];
            e.Entity2 = m_PhysicsSystem->m_BodiesToEntities[contact->GetFixtureB()->GetBody()];

-            std::cout << e.Entity1 << " " << e.Entity2 << std::endl;
-
            m_PhysicsSystem->EventBroker->Publish(e);
        }
        void EndContact(b2Contact* contact)