From c459560bfab7212e8a43a42b344c22d49449dc7b Mon Sep 17 00:00:00 2001
From: viktorljung <vilb12@student.bth.se>
Date: Fri, 25 Sep 2015 05:39:09 +0200
Subject: [PATCH 1/4] Fixed score not accumulating correctly

---
 include/Game/HUD.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Game/HUD.h b/include/Game/HUD.h
index def63bf..2a240b3 100644
--- a/include/Game/HUD.h
+++ b/include/Game/HUD.h
@@ -43,7 +43,7 @@ private:
 
 	bool OnScore(const Events::ScoreEvent& event)
 	{
-		m_ScoreNumberFrame->SetNumber(event.Score);
+		m_ScoreNumberFrame->SetNumber(m_ScoreNumberFrame->Number() + event.Score);
 	}
 };
 

From 17f890569681b669036b90f751650aef97e035cc Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Fri, 25 Sep 2015 05:47:20 +0200
Subject: [PATCH 2/4] Removed the HUD from the menu screen

---
 include/Core/Engine.h       | 1 -
 include/Game/MainMenuMain.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index 9841ee0..e3959b2 100644
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -80,7 +80,6 @@ public:
 		m_FrameStack = new GUI::Frame(m_EventBroker.get());
 		m_FrameStack->Width = 675;
 		m_FrameStack->Height = 1080;
-		auto hud = new GUI::HUD(m_FrameStack, "HUD");
 		auto menu = new GUI::MainMenu(m_FrameStack, "MainMenu");
 
 		m_InputManager = std::make_shared<InputManager>(m_Renderer->Window(), m_EventBroker);
diff --git a/include/Game/MainMenuMain.h b/include/Game/MainMenuMain.h
index 24296ed..c74027f 100644
--- a/include/Game/MainMenuMain.h
+++ b/include/Game/MainMenuMain.h
@@ -4,6 +4,7 @@
 #include "GUI/TextureFrame.h"
 #include "GUI/Button.h"
 #include "Game/EGameStart.h"
+#include "Game/HUD.h"
 
 namespace dd
 {
@@ -59,6 +60,7 @@ private:
 			Events::GameStart e;
 			EventBroker->Publish(e);
 			m_Parent->Hide();
+			auto hud = new GUI::HUD(BaseFrame, "HUD");
 		}
 
 		return true;

From 7d9e3e00a44be8f81458706eabbb293af3324b52 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Fri, 25 Sep 2015 08:23:41 +0200
Subject: [PATCH 3/4] Fixed out-of-range error in NumberFrame

---
 include/GUI/NumberFrame.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/GUI/NumberFrame.h b/include/GUI/NumberFrame.h
index 2d7c00c..ac51aed 100644
--- a/include/GUI/NumberFrame.h
+++ b/include/GUI/NumberFrame.h
@@ -24,7 +24,6 @@ public:
 		m_NumberTextures[7] = "Textures/GUI/Numbers/N7.png";
 		m_NumberTextures[8] = "Textures/GUI/Numbers/N8.png";
 		m_NumberTextures[9] = "Textures/GUI/Numbers/N9.png";
-		SetNumber(0);
 
 		// Create number frame if missing
 		for (int i = 0; i < 10; i++) {
@@ -41,6 +40,8 @@ public:
 			}
 			m_NumberFrames.push_front(frame);
 		}
+
+		SetNumber(0);
 	}
 
 	int Number() const { return m_Number; }

From 2d7703afadfb7f776ad7c8bc855b90af7677de41 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Mon, 28 Sep 2015 17:17:24 +0200
Subject: [PATCH 4/4] Header definitions added to style guide

---
 tools/StyleGuide.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/StyleGuide.h b/tools/StyleGuide.h
index f43b57c..99c152c 100755
--- a/tools/StyleGuide.h
+++ b/tools/StyleGuide.h
@@ -1,6 +1,12 @@
 #ifndef NAMESPACE_FILENAME_H__
 #define NAMESPACE_FILENAME_H__
 
+#include <standard_library>
+
+#include <external_dependency>
+
+#include "Internal/Header.h"
+
 namespace dd
 {