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

Conflicts:
	src/game/Physics/ContactListener.cpp
	src/game/Physics/PhysicsSystem.cpp

include/Physics/CPhysics.h

@@ -9,13 +9,14 @@ namespace CollisionLayer
 {
 enum Type
 {
-    Pad = 1 << 0,
-    Ball = 1 << 1,
-    Brick = 1 << 2,
-    Water = 1 << 3,
-    PowerUp = 1 << 4,
-    Other = 1 << 5,
-    Wall = 1 << 6
+	Pad = 1 << 0,
+	Ball = 1 << 1,
+	Brick = 1 << 2,
+	Water = 1 << 3,
+	PowerUp = 1 << 4,
+	Other = 1 << 5,
+	Wall = 1 << 6,
+	LifeBuoy = 1 << 7
 };
 }
 
@@ -39,20 +40,21 @@ enum Type
 
             bool Calculate = false;
             float GravityScale = 0.f;
+			float Density = 20.f;
 
 
             CollisionLayer::Type Category = CollisionLayer::Type::Other;
-	CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
-		CollisionLayer::Pad
-		| CollisionLayer::Ball
-		| CollisionLayer::Brick
-		| CollisionLayer::Water
-		| CollisionLayer::PowerUp
-		| CollisionLayer::Wall
-		| CollisionLayer::Other
-	);
-        };
-
+			CollisionLayer::Type Mask =	static_cast<CollisionLayer::Type>(
+				CollisionLayer::Pad
+				| CollisionLayer::Ball
+				| CollisionLayer::Brick
+				| CollisionLayer::Water
+				| CollisionLayer::PowerUp
+				| CollisionLayer::Wall
+				| CollisionLayer::LifeBuoy
+				| CollisionLayer::Other
+		);
+   };
 }
 }
 

include/Physics/PhysicsSystem.h

@@ -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