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

Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp

include/Core/Engine.h

@@ -187,6 +187,7 @@ public:
 			auto transform = m_World->AddComponent<Components::Transform>(t_halfPipe);
 			transform->Position = glm::vec3(0.f, 34.6f, -15.f);
 			transform->Scale = glm::vec3(6.f, 6.f, 10.f);
+			transform->Sticky = false;
 			auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
 			model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj";
 			model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 0.3f);

include/Game/BallSystem.h

@@ -21,6 +21,7 @@
 #include "Game/EResetBall.h"
 #include "Game/EMultiBall.h"
 #include "Game/EMultiBallLost.h"
+#include "Game/EStickyPad.h"
 #include "Game/EGameOver.h"
 #include "Game/EPause.h"
 #include "Game/EHitPad.h"
@@ -92,6 +93,8 @@ private:
     bool m_ReplaceBall = false;
     bool m_Pause = false;
     bool m_Waiting = true;
+	bool m_Sticky = false;
+	int m_StickyCounter = 5;
     EntityID m_LastCollision = 999999;
 
     glm::vec3 m_SavedSpeed;
@@ -106,6 +109,7 @@ private:
     dd::EventRelay<BallSystem, dd::Events::MultiBallLost> m_EMultiBallLost;
     dd::EventRelay<BallSystem, dd::Events::ResetBall> m_EResetBall;
     dd::EventRelay<BallSystem, dd::Events::MultiBall> m_EMultiBall;
+	dd::EventRelay<BallSystem, dd::Events::StickyPad> m_EStickyPad;
     dd::EventRelay<BallSystem, dd::Events::Pause> m_EPause;
     dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
     dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
@@ -115,6 +119,7 @@ private:
     bool OnMultiBallLost(const dd::Events::MultiBallLost &event);
     bool OnResetBall(const dd::Events::ResetBall &event);
     bool OnMultiBall(const dd::Events::MultiBall &event);
+	bool OnStickyPad(const dd::Events::StickyPad &event);
     bool OnPause(const dd::Events::Pause &event);
     bool OnActionButton(const dd::Events::ActionButton &event);
 };

include/Game/CBall.h

@@ -20,6 +20,8 @@ struct Ball : Component
     int Combo = 0;
     bool Paused = false;
     bool Waiting = true;
+	bool Sticky = false;
+	glm::vec3 StickyPlacement = glm::vec3(0, 0, 0);
     glm::vec3 SavedSpeed = glm::vec3(0, 0, 0);
 };
 

include/Game/EStickyPad.h

@@ -0,0 +1,25 @@
+//
+// Created by Adniklastrator on 2015-10-08.
+//
+
+#ifndef DAYDREAM_ESTICKYPAD_H
+#define DAYDREAM_ESTICKYPAD_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct StickyPad : Event
+{
+    Components::Transform* Transform;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_ESTICKYPAD_H

include/Game/LevelSystem.h

@@ -23,6 +23,7 @@
 #include "Game/EComboEvent.h"
 #include "Game/EHitPad.h"
 #include "Game/ELifebuoy.h"
+#include "Game/EStickyPad.h"
 #include "Game/EMultiBall.h"
 #include "Game/EMultiBallLost.h"
 #include "Game/EPause.h"
@@ -109,7 +110,7 @@ private:
     bool m_Initialized = false;
     bool m_Pause = false;
     int m_LooseBricks = 0;
-    int m_CurrentCluster = 2;
+    int m_CurrentCluster = 1;
     int m_CurrentLevel = 1;
     int m_MultiBalls = 0;
     int m_PowerUps = 0;
@@ -125,6 +126,7 @@ private:
     const int StandardBrick = 1;
     const int MultiBallBrick = 2;
 	const int LifebuoyBrick = 3;
+	const int StickyBrick = 4;
 
     EntityID m_BrickTemplate;
 

include/Game/LifebuoySystem.h

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