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

Conflicts: src/game/Game/BallSystem.cpp src/game/Game/LevelSystem.cpp src/game/Physics/PhysicsSystem.cpp
2015-10-08 17:28:28 +02:00
parent b93013fcd8 c76033113d
commit 87fd73f249
10 changed files with 119 additions and 35 deletions
@@ -56,11 +56,11 @@ private:
 	struct LifeBuoyInfo
 	{
 		EntityID Entity;
-		float TimeToLive = 20.f;
+		float TimeToLive = 15.f;
 	};

-	float m_LeftEdge = -4.f;
-	float m_RightEdge = 4.f;
+	float m_LeftEdge = -3.8f;
+	float m_RightEdge = 3.8f;
 	std::list<LifeBuoyInfo> m_LifeBuoys;
 };