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

Conflicts: src/game/Physics/ContactListener.cpp src/game/Physics/PhysicsSystem.cpp
2015-10-08 21:39:48 +02:00
parent 143bff2d9e 87fd73f249
commit 706e720ae8
25 changed files with 5314 additions and 94 deletions
@@ -117,7 +117,7 @@ namespace dd
 			dd::EventRelay<PhysicsSystem, dd::Events::Contact> m_EContact;
 			bool OnContact(const dd::Events::Contact &event);
 			bool m_Travelling = false;
-			float m_Timer = 0;
+			float m_DistanceTravelled = 0;

            //TODO: Fill struct with info needed.
        struct EmitterHandler //TODO CHANGE NAMES