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

Conflicts:
	src/game/Physics/PhysicsSystem.cpp

include/GUI/Button.h

@@ -93,7 +93,7 @@ protected:
 	virtual bool OnMousePress(const Events::MousePress& event)
 	{
 		if (Hidden()) {
-			LOG_DEBUG("Pressed hidden button");
+			//LOG_DEBUG("Pressed hidden button");
 			return false;
 		}
 
@@ -117,7 +117,7 @@ protected:
 	virtual bool OnMouseRelease(const Events::MouseRelease& event)
 	{
 		if (Hidden()) {
-			LOG_DEBUG("Released hidden button");
+			//LOG_DEBUG("Released hidden button");
 			return false;
 		}
 

include/GUI/NumberFrame.h

@@ -10,11 +10,11 @@ namespace dd
 namespace GUI
 {
 
-class NumberFrame : public Frame
+class NumberFrame : public TextureFrame
 {
 public:
 	NumberFrame(Frame* parent, std::string name)
-		: Frame(parent, name)
+		: TextureFrame(parent, name)
 	{
 		m_CharacterTextures['0'] = "Textures/GUI/Numbers/N0.png";
 		m_CharacterTextures['1'] = "Textures/GUI/Numbers/N1.png";

include/Game/GUI/HUD.h

@@ -41,6 +41,7 @@ public:
 		//m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
 		//m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
 		m_ScoreNumberFrame = new GUI::NumberFrame(this, "HUDScoreNumberFrame");
+		m_ScoreNumberFrame->SetTexture("Textures/GUI/Numbers/Background.png");
 		//m_ScoreNumberFrame->X = 15;
 		m_ScoreNumberFrame->Y = 18;
 

include/Physics/PhysicsSystem.h

@@ -100,6 +100,8 @@ namespace dd
             std::unordered_map<b2Body*, EntityID> m_BodiesToEntities;
 
 
+			int t_counter = 0;
+
 
             void CreateBody(EntityID entity);
             void SyncEntitiesWithBodies();
@@ -130,7 +132,7 @@ namespace dd
             std::vector<EntityID> ParticleEmitter;
             std::vector<EntityID> ParticleTemplate;
         };
-            EmitterHandler m_ParticleEmitters;
+        EmitterHandler m_ParticleEmitters;
 
             std::list<Impulse> m_Impulses;