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

include/Game/Systems/CapturePointHUDSystem.h

@@ -0,0 +1,22 @@
+#ifndef CapturePointHUDSystem_h__
+#define CapturePointHUDSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Engine/Collision/ETrigger.h"
+
+class CapturePointHUDSystem : public ImpureSystem
+{
+public:
+    CapturePointHUDSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+};
+
+#endif

include/Game/Systems/PlayerMovementSystem.h

@@ -7,6 +7,9 @@
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
+
 class PlayerMovementSystem : public ImpureSystem
 {
 public: