Merge remote-tracking branch 'origin/master' into HUD-Timers

# Conflicts:
#	resources/Schema/Entities/Player.xml

include/Engine/Core/ECaptured.h

@@ -12,7 +12,9 @@ namespace Events
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;
-    EntityID CapturePointID;
+    EntityID CapturePointTakenID;
+    EntityWrapper BlueTeamNextCapturePoint;
+    EntityWrapper RedTeamNextCapturePoint;
 };
 
 }

include/Engine/Core/EntityFile.h

@@ -1,164 +1,21 @@
 #ifndef EntityFile_h__
 #define EntityFile_h__
 
-#include <stack>
-#include <boost/lexical_cast.hpp>
-#include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/sax2/SAX2XMLReader.hpp>
-#include <xercesc/sax2/XMLReaderFactory.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/sax2/Attributes.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/XMLChar.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
-#include <xercesc/framework/XMLDocumentHandler.hpp>
-#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
-#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
-#include <xercesc/framework/psvi/XSParticle.hpp>
-#include <xercesc/framework/psvi/XSModelGroup.hpp>
-#include <xercesc/framework/psvi/XSAnnotation.hpp>
-#include <xercesc/framework/psvi/XSValue.hpp>
-#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/dom/DOMLSInput.hpp>
-#include <xercesc/dom/DOMElement.hpp>
+#include "World.h"
+#include "EntityXMLFile.h"
+#include "EntityXMLFilePreprocessor.h"
+#include "EntityXMLFileParser.h"
+#include "EntityWrapper.h"
 
-#include "../GLM.h"
-#include "Util/XercesString.h"
-#include "ResourceManager.h"
-#include "Entity.h"
-#include "ComponentInfo.h"
-
-class EntityFileHandler
-{
-    friend class EntityFileSAXHandler;
-public:
-    // @param EntityID The entity found
-    // @param EntityID The parent of the entity
-    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
-    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
-    // @param EntityID The entity the component corresponds to
-    // @param std::string Type name of the component
-    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
-    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param std::map<std::string, std::string> Field attribute names and values
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
-    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
-    // @param EntityID Entity 
-    // @param std::string Component name 
-    // @param std::string Field name
-    // @param char* Field data
-    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
-    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
-
-private:
-    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
-    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
-    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
-    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
-};
-
-class EntityFileSAXHandler : public xercesc::DefaultHandler
+class EntityFile : private World, public Resource
 {
 public:
-    enum class State
-    {
-        Unknown,
-        Entity,
-        Component,
-        ComponentField
-    };
+    EntityFile(std::string path);
 
-    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
-
-    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
-    void characters(const XMLCh* const chars, const XMLSize_t length) override;
-    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
-
-    void warning(const xercesc::SAXParseException& e);
-    void error(const xercesc::SAXParseException& e);
-    void fatalError(const xercesc::SAXParseException& e);
+    EntityWrapper MergeInto(World* other);
 
 private:
-    const EntityFileHandler* m_Handler;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_Reader;
-    //State m_CurrentScope = State::Unknown;
-    std::stack<State> m_StateStack;
-    unsigned int m_NextEntityID = 0;
-    std::stack<EntityID> m_EntityStack;
-    std::string m_CurrentComponent;
-    std::string m_CurrentField;
-    std::map<std::string, std::string> m_CurrentAttributes;
-
-    void onStartEntity(const xercesc::Attributes& attrs); 
-    void onEndEntity();
-    void onStartEntityRef(const xercesc::Attributes& attrs);
-    void onStartComponent(const std::string& name);
-    void onEndComponent(const std::string& name);
-    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
-    void onEndComponentField(const std::string& field);
-    void onFieldData(char* data);
-};
-
-class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
-{
-public:
-	void warning(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Warning", e);
-	}
-	void error(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("Error", e);
-	}
-	void fatalError(const xercesc::SAXParseException& e) override
-	{
-		reportParseException("FATAL ERROR", e);
-	}
-	void resetErrors() override { }
-
-private:
-	void reportParseException(std::string type, const xercesc::SAXParseException& e)
-	{
-		char* message = xercesc::XMLString::transcode(e.getMessage());
-		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
-		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
-		std::cerr << type << ": " << message << std::endl;
-		xercesc::XMLString::release(&systemID);
-		xercesc::XMLString::release(&message);
-	}
-};
-
-class EntityFile : public Resource
-{
-    friend class ResourceManager;
-    friend class EntityFileSAXHandler;
-private:
-    EntityFile(boost::filesystem::path path);
-    ~EntityFile();
-
-public:
-    static unsigned int GetTypeStride(std::string typeName);
-    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
-    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
-
-    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
-
-    void Parse(const EntityFileHandler* handler) const;
-
-private:
-    boost::filesystem::path m_FilePath;
-    xercesc::XMLGrammarPool* m_GrammarPool;
-    xercesc::SAX2XMLReader* m_SAX2XMLReader;
-	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
-    //std::vector<std::string> m_EntityReferences;
-
-    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+    EntityID m_RootEntity = EntityID_Invalid;
 };
 
 #endif

include/Engine/Core/EntityXMLFile.h

@@ -0,0 +1,164 @@
+#ifndef EntityXMLFile_h__
+#define EntityXMLFile_h__
+
+#include <stack>
+#include <boost/lexical_cast.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+#include <xercesc/sax2/XMLReaderFactory.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/sax2/Attributes.hpp>
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/XMLChar.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+#include <xercesc/framework/XMLDocumentHandler.hpp>
+#include <xercesc/framework/psvi/XSElementDeclaration.hpp>
+#include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
+#include <xercesc/framework/psvi/XSParticle.hpp>
+#include <xercesc/framework/psvi/XSModelGroup.hpp>
+#include <xercesc/framework/psvi/XSAnnotation.hpp>
+#include <xercesc/framework/psvi/XSValue.hpp>
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMLSInput.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+
+#include "../GLM.h"
+#include "Util/XercesString.h"
+#include "ResourceManager.h"
+#include "Entity.h"
+#include "ComponentInfo.h"
+
+class EntityFileHandler
+{
+    friend class EntityFileSAXHandler;
+public:
+    // @param EntityID The entity found
+    // @param EntityID The parent of the entity
+    typedef std::function<void(EntityID, EntityID, const std::string&)> OnStartEntityCallback;
+    void SetStartEntityCallback(OnStartEntityCallback c) { m_OnStartEntityCallback = c; }
+    // @param EntityID The entity the component corresponds to
+    // @param std::string Type name of the component
+    typedef std::function<void(EntityID, const std::string&)> OnStartComponentCallback;
+    void SetStartComponentCallback(OnStartComponentCallback c) { m_OnStartComponentCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param std::map<std::string, std::string> Field attribute names and values
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const std::map<std::string, std::string>&)> OnStartFieldCallback;
+    void SetStartFieldCallback(OnStartFieldCallback c) { m_OnStartFieldCallback = c; }
+    // @param EntityID Entity 
+    // @param std::string Component name 
+    // @param std::string Field name
+    // @param char* Field data
+    typedef std::function<void(EntityID, const std::string&, const std::string&, const char*)> OnStartFieldDataCallback;
+    void SetStartFieldDataCallback(OnStartFieldDataCallback c) { m_OnStartFieldDataCallback = c; }
+
+private:
+    OnStartEntityCallback m_OnStartEntityCallback = nullptr;
+    OnStartComponentCallback m_OnStartComponentCallback = nullptr;
+    OnStartFieldCallback m_OnStartFieldCallback = nullptr;
+    OnStartFieldDataCallback m_OnStartFieldDataCallback = nullptr;
+};
+
+class EntityFileSAXHandler : public xercesc::DefaultHandler
+{
+public:
+    enum class State
+    {
+        Unknown,
+        Entity,
+        Component,
+        ComponentField
+    };
+
+    EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader);
+
+    void startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs) override;
+    void characters(const XMLCh* const chars, const XMLSize_t length) override;
+    void endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname) override;
+
+    void warning(const xercesc::SAXParseException& e);
+    void error(const xercesc::SAXParseException& e);
+    void fatalError(const xercesc::SAXParseException& e);
+
+private:
+    const EntityFileHandler* m_Handler;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_Reader;
+    //State m_CurrentScope = State::Unknown;
+    std::stack<State> m_StateStack;
+    unsigned int m_NextEntityID = 0;
+    std::stack<EntityID> m_EntityStack;
+    std::string m_CurrentComponent;
+    std::string m_CurrentField;
+    std::map<std::string, std::string> m_CurrentAttributes;
+
+    void onStartEntity(const xercesc::Attributes& attrs); 
+    void onEndEntity();
+    void onStartEntityRef(const xercesc::Attributes& attrs);
+    void onStartComponent(const std::string& name);
+    void onEndComponent(const std::string& name);
+    void onStartComponentField(const std::string& field, const xercesc::Attributes& attrs);
+    void onEndComponentField(const std::string& field);
+    void onFieldData(char* data);
+};
+
+class EntityFileXMLErrorHandler : public xercesc::ErrorHandler
+{
+public:
+	void warning(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Warning", e);
+	}
+	void error(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("Error", e);
+	}
+	void fatalError(const xercesc::SAXParseException& e) override
+	{
+		reportParseException("FATAL ERROR", e);
+	}
+	void resetErrors() override { }
+
+private:
+	void reportParseException(std::string type, const xercesc::SAXParseException& e)
+	{
+		char* message = xercesc::XMLString::transcode(e.getMessage());
+		char* systemID = xercesc::XMLString::transcode(e.getSystemId());
+		std::cerr << systemID << ":" << e.getLineNumber() << ":" << e.getColumnNumber() << std::endl;
+		std::cerr << type << ": " << message << std::endl;
+		xercesc::XMLString::release(&systemID);
+		xercesc::XMLString::release(&message);
+	}
+};
+
+class EntityXMLFile : public Resource
+{
+    friend class ResourceManager;
+    friend class EntityFileSAXHandler;
+private:
+    EntityXMLFile(boost::filesystem::path path);
+    ~EntityXMLFile();
+
+public:
+    static unsigned int GetTypeStride(std::string typeName);
+    static void WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes);
+    static void WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData);
+
+    xercesc::XMLGrammarPool* GrammarPool() const { return m_GrammarPool; }
+
+    void Parse(const EntityFileHandler* handler) const;
+
+private:
+    boost::filesystem::path m_FilePath;
+    xercesc::XMLGrammarPool* m_GrammarPool;
+    xercesc::SAX2XMLReader* m_SAX2XMLReader;
+	//std::map<std::string, ::ComponentInfo> m_ComponentInfo;
+    //std::vector<std::string> m_EntityReferences;
+
+    static void setReaderFeatures(xercesc::SAX2XMLReader* reader);
+};
+
+#endif

include/Engine/Core/EntityXMLFileParser.h

@@ -1,18 +1,19 @@
-#ifndef EntityFileParser_h__
-#define EntityFileParser_h__
+#ifndef EntityXMLFileParser_h__
+#define EntityXMLFileParser_h__
 
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileParser
+class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
-    EntityFileParser(const EntityFile* entityFile);
-
-    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+    EntityXMLFileParser(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
+
+    const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;
     EntityID m_FirstEntity = EntityID_Invalid;

include/Engine/Core/EntityXMLFilePreprocessor.h

@@ -1,5 +1,5 @@
-#ifndef EntityFilePreprocessor_h__
-#define EntityFilePreprocessor_h__
+#ifndef EntityXMLFilePreprocessor_h__
+#define EntityXMLFilePreprocessor_h__
 
 #include <xercesc/framework/psvi/XSElementDeclaration.hpp>
 #include <xercesc/framework/psvi/XSComplexTypeDefinition.hpp>
@@ -17,17 +17,18 @@
 #include "Util/XercesString.h"
 #include "ResourceManager.h"
 #include "World.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 
-class EntityFilePreprocessor
+class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
-    EntityFilePreprocessor(const EntityFile* entityFile);
-
-    void RegisterComponents(World* world);
+    EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
 private:
-    const EntityFile* m_EntityFile;
+    void RegisterComponents(World* world);
+
+    const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;
 

include/Engine/Core/EntityXMLFileWriter.h

@@ -1,5 +1,5 @@
-#ifndef EntityFileWriter_h__
-#define EntityFileWriter_h__
+#ifndef EntityXMLFileWriter_h__
+#define EntityXMLFileWriter_h__
 
 #include <boost/filesystem.hpp>
 #include <xercesc/dom/DOM.hpp>
@@ -8,13 +8,13 @@
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
 #include "Util/XercesString.h"
-#include "EntityFile.h"
+#include "EntityXMLFile.h"
 #include "World.h"
 
-class EntityFileWriter
+class EntityXMLFileWriter
 {
 public:
-    EntityFileWriter(boost::filesystem::path file)
+    EntityXMLFileWriter(boost::filesystem::path file)
         : m_FilePath(file)
     {
         using namespace xercesc;

include/Engine/Core/MemoryPool.h

@@ -118,9 +118,6 @@ public:
 		else {
 			m_ExtraMemory.push_back((char*)malloc(m_Stride));
 			//We should preferably not enter here to avoid performance issues. Set more numMaxElements in constructor instead.
-            if (!DisableMemoryPool::Value) {
-			    LOG_DEBUG("Allocated slots exceed Pool size, extra memory allocated dynamically. Pool size: %u, dynamic size: %u.", m_NumSlots, m_ExtraMemory.size());
-            }
 			return m_ExtraMemory.back();
 		}
 	}

include/Engine/Core/World.h

@@ -6,6 +6,7 @@
 #include "ObjectPool.h"
 #include "ComponentPool.h"
 #include "EventBroker.h"
+struct EntityWrapper;
 
 class World
 {
@@ -18,13 +19,13 @@ public:
     World(const World& other);
 
     // Create empty entity
-    EntityID CreateEntity(EntityID parent = 0);
+    EntityID CreateEntity(EntityID parent = EntityID_Invalid);
     // Delete entity and all components within
     void DeleteEntity(EntityID entity);
     // Check if an entity exists
     bool ValidEntity(EntityID entity) const;
     // Register a component type and allocate space for it
-    void RegisterComponent(ComponentInfo& ci);
+    void RegisterComponent(const ComponentInfo& ci);
     // Attach a component to an entity and fill it with default values
     ComponentWrapper AttachComponent(EntityID entity, const std::string& componentType);
     // Check if an entity has a component
@@ -49,6 +50,12 @@ public:
     void SetName(EntityID entity, const std::string& name);
     // Get the textual name of an entity
     std::string GetName(EntityID entity) const;
+    // Get the first entity in the world with the name.
+    EntityWrapper GetFirstEntityByName(const std::string& name);
+
+    // Merge another world into this one
+    // Returns a map that maps entities from the other world to their copies in this one
+    std::unordered_map<EntityID, EntityID> Merge(const World* other);
 
 private:
     EventBroker* m_EventBroker = nullptr;

include/Engine/Editor/EditorCameraInputController.h

@@ -104,6 +104,11 @@ protected:
         if (!m_Enabled) {
             return false;
         }
+            
+        ImGuiIO& io = ImGui::GetIO();
+        if (io.WantCaptureMouse || io.WantCaptureKeyboard) {
+            return false;
+        }
 
         m_SpeedMultiplier += e.DeltaY * (0.1 * m_SpeedMultiplier);
         m_Config->Set("Editor.CameraSpeed", m_SpeedMultiplier);

include/Engine/Editor/EditorSystem.h

@@ -5,9 +5,8 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityFilePreprocessor.h"
-#include "../Core/EntityFileParser.h"
-#include "../Core/EntityFileWriter.h"
+#include "../Core/EntityFile.h"
+#include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"
 #include "EditorGUI.h"

include/Engine/Input/FirstPersonInputController.h

@@ -27,7 +27,7 @@ public:
     virtual bool OnCommand(const Events::InputCommand& e) override;
     virtual void Reset();
 
-    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
+    void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID);
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
 
@@ -41,7 +41,7 @@ protected:
     bool m_Crouching = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_AssaultDashCoolDownTimer = 0.0;
+    double m_DashEffectResetTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -52,7 +52,7 @@ protected:
     bool m_ShiftDashing = false;
     bool m_ValidDoubleTap = false;
 
-    //specialabilitys
+    //specialabilities
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
     int m_NumberOfMovementKeysDown = 0;
@@ -191,23 +191,33 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 }
 
 template <typename EventContext>
-void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer) {
+void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    m_AssaultDashCoolDownTimer -= dt;
+    m_DashEffectResetTimer += dt;
+    assaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
-    if (m_AssaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
+    if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
+        if (m_DashEffectResetTimer > 0.05) {
+            Events::DashAbility e;
+            e.Player = playerID;
+            m_EventBroker->Publish(e);
+            m_DashEffectResetTimer = 0.0;
+        }
     } else {
         m_PlayerIsDashing = false;
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
+    if (m_ShiftDashing && assaultDashCoolDownTimer <= 0.0f) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
-        m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+        assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+        Events::DashAbility e;
+        e.Player = playerID;
+        m_EventBroker->Publish(e);
         return;
     }
 
@@ -227,7 +237,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
+    if (!(assaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -235,9 +245,10 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     //ok, we have a valid tap, lets do it
     m_AssaultDashDoubleTapped = true;
     m_AssaultDashDoubleTapDeltaTime = 0.f;
-    m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
+    assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
 
     Events::DashAbility e;
+    e.Player = playerID;
     m_EventBroker->Publish(e);
 }
 

include/Engine/Network/Client.h

@@ -26,7 +26,9 @@
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
+#include "Core/EAmmoPickup.h"
 #include "Network/ESearchForServers.h"
+#include "../Game/Events/EDashAbility.h"
 
 struct ServerInfo
 {
@@ -106,7 +108,9 @@ private:
     void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
     void parseDoubleJump(Packet& packet);
-    void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
+    void parseDashEffect(Packet& packet);
+    void parseAmmoPickup(Packet& packet);
+    void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
     void hasServerTimedOut();
@@ -133,6 +137,9 @@ private:
     EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
     EventRelay<Client, Events::DoubleJump> m_EDoubleJump;
     bool OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<Client, Events::DashAbility> m_EDashAbility;
+    bool OnDashAbility(const Events::DashAbility& e);
+
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;
     std::vector<ServerInfo> m_Serverlist;

include/Engine/Network/MessageType.h

@@ -20,7 +20,9 @@ enum class MessageType
     ComponentDeleted,
     PlayerTransform,
     OnDoubleJump,
+    OnDashEffect,
     ServerlistRequest,
+    AmmoPickup,
     Invalid
 };
 

include/Engine/Network/Server.h

@@ -20,6 +20,7 @@
 #include "../Game/Events/EDoubleJump.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
+#include "Core/EAmmoPickup.h"
 
 class Server : public Network
 {
@@ -82,13 +83,14 @@ private:
     void parseClientPing();
     void parsePing();
     bool parseDoubleJump(Packet& packet);
+    void parseDashEffect(Packet& packet);
     void parseUDPConnect(Packet& packet);
     void parseTCPConnect(Packet& packet);
     void parseDisconnect();
     void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
-    // Debug event
+    // Events
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Server, Events::PlayerSpawned> m_EPlayerSpawned;
@@ -99,6 +101,8 @@ private:
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
     EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
     bool OnPlayerDamage(const Events::PlayerDamage& e);
+    EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
+    bool OnAmmoPickup(const Events::AmmoPickup& e);
 };
 
 #endif

include/Game/Events/EDashAbility.h

@@ -2,11 +2,15 @@
 #define Events_DashAbility_h__
 
 #include "Core/Event.h"
+#include "Core/EntityWrapper.h"
 
 namespace Events
 {
 
-struct DashAbility : public Event { };
+struct DashAbility : public Event 
+{
+    EntityID Player;
+};
 
 }
 

include/Game/Game.h

@@ -13,13 +13,13 @@
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFilePreprocessor.h"
 #include "Core/SystemPipeline.h"
 #include "Systems/ExplosionEffectSystem.h"
 #include "Editor/EditorSystem.h"
-#include "Core/EntityFile.h"
+#include "Core/EntityXMLFile.h"
 #include "Rendering/RenderSystem.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Rendering/Font.h"
 #include "Systems/InterpolationSystem.h"

include/Game/Systems/AbilityCooldownHUDSystem.h

@@ -0,0 +1,17 @@
+#ifndef AbilityCooldownHUDSystem_h__
+#define AbilityCooldownHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class AbilityCooldownHUDSystem : public ImpureSystem
+{
+public:
+    AbilityCooldownHUDSystem(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(double dt) override;
+};
+
+#endif

include/Game/Systems/AmmoPickupSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
@@ -20,6 +20,11 @@ public:
 private:
     EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<AmmoPickupSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
+
+    EventRelay<AmmoPickupSystem, Events::AmmoPickup> m_EAmmoPickup;
+    bool OnAmmoPickup(Events::AmmoPickup& e);
 
     struct NewAmmoPickup {
         glm::vec3 Pos;
@@ -29,5 +34,11 @@ private:
         EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif

include/Game/Systems/BoostIconsHUDSystem.h

@@ -0,0 +1,19 @@
+#ifndef BoostIconsHUDSystem_h__
+#define BoostIconsHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class BoostIconsHUDSystem : public PureSystem
+{
+public:
+    BoostIconsHUDSystem(SystemParams params)
+        : System(params)
+        , PureSystem("BoostIconsHUD")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
+
+};
+
+#endif

include/Game/Systems/BoostSystem.h

@@ -0,0 +1,21 @@
+#ifndef BoostSystem_h__
+#define BoostSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFile.h"
+#include "Core/EPlayerDamage.h"
+#include "Common.h"
+
+class BoostSystem : public System
+{
+public:
+    BoostSystem(SystemParams params);
+
+private:
+    EventRelay<BoostSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(Events::PlayerDamage& e);
+
+    std::string DetermineClass(EntityWrapper player);
+};
+#endif

include/Game/Systems/CapturePointArrowHUDSystem.h

@@ -0,0 +1,30 @@
+#ifndef CapturePointArrowHUDSystem_h__
+#define CapturePointArrowHUDSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+#include <glm/gtx/vector_angle.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ECaptured.h"
+
+
+class CapturePointArrowHUDSystem : public ImpureSystem
+{
+public:
+    CapturePointArrowHUDSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<CapturePointArrowHUDSystem, Events::Captured> m_ECapturedEvent;
+    bool OnCapturePointCaptured(Events::Captured& e);
+
+    bool m_InitialtargetsSet = false;
+    glm::vec3 m_RedTeamCurrentTarget;
+    glm::vec3 m_BlueTeamCurrentTarget;
+};
+
+#endif

include/Game/Systems/CapturePointHUDSystem.h

@@ -7,7 +7,7 @@
 
 #include "Common.h"
 #include "Core/System.h"
-#include "Engine/Collision/ETrigger.h"
+#include "Collision/ETrigger.h"
 
 class CapturePointHUDSystem : public ImpureSystem
 {

include/Game/Systems/CapturePointSystem.h

@@ -42,9 +42,9 @@ private:
     int m_NumberOfCapturePoints = 0;
     std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;
 
-    //std::vector<ComponentWrapper>
-
     bool m_ResetTimers = false;
+    bool m_RecentlyCapturedNeedNextCapturePointNow = false;
+    Events::Captured m_CapturedEvent;
 
     //vectors which will keep track of enter/leave changes
     std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;

include/Game/Systems/DamageIndicatorSystem.h

@@ -4,7 +4,7 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
 #include <tuple>

include/Game/Systems/FloatingEffectSystem.h

@@ -0,0 +1,19 @@
+#include "Common.h"
+#include "Core/System.h"
+
+class FloatingEffectSystem : public PureSystem
+{
+public:
+    FloatingEffectSystem(SystemParams params)
+        : System(params)
+        , PureSystem("FloatingEffect")
+    { }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override
+    {
+        ComponentWrapper& transform = m_World->GetComponent(component.EntityID, "Transform");
+        (double&)component["Time"] += dt;
+        (glm::vec3&)transform["Position"] = (float)(double)component["Amplitude"] * glm::sin((glm::two_pi<float>() / (float)(double)component["Period"]) *  (float)(double)component["Time"]) * (glm::vec3)component["Axis"];
+
+    }
+};

include/Game/Systems/PickupSpawnSystem.h

@@ -4,12 +4,11 @@
 #include "Core/System.h"
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 #include "Core/EPickupSpawned.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
-#include <tuple>
 
 class PickupSpawnSystem : public ImpureSystem
 {
@@ -21,6 +20,8 @@ public:
 private:
     EventRelay<PickupSpawnSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool OnTriggerTouch(Events::TriggerTouch& e);
+    EventRelay<PickupSpawnSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool OnTriggerLeave(Events::TriggerLeave& e);
 
     struct NewHealthPickup {
         glm::vec3 Pos;
@@ -30,5 +31,11 @@ private:
         EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
+    struct EntityAtMaxValuePickupStruct {
+        EntityWrapper player;
+        EntityWrapper trigger;
+    };
+    std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
+    void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
 };
 #endif

include/Game/Systems/PlayerDeathSystem.h

@@ -6,11 +6,9 @@
 #include "GLM.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
-
 #include "Core/EPlayerDeath.h"
+#include "Core/EEntityDeleted.h"
 
 class PlayerDeathSystem : public ImpureSystem
 {
@@ -20,8 +18,12 @@ public:
     virtual void Update(double dt) override;
 
 private:
+    EntityWrapper m_LocalPlayerDeathEffect;
+
     EventRelay<PlayerDeathSystem, Events::PlayerDeath> m_OnPlayerDeath;
     bool OnPlayerDeath(Events::PlayerDeath& e);
+    EventRelay<PlayerDeathSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
 
     void createDeathEffect(EntityWrapper player);
 

include/Game/Systems/PlayerMovementSystem.h

@@ -6,9 +6,7 @@
 #include <imgui/imgui.h>
 #include "Events/EDoubleJump.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
-
 #include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
 
 class PlayerMovementSystem : public ImpureSystem
 {
@@ -41,6 +39,8 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
     EventRelay<PlayerMovementSystem, Events::DoubleJump> m_EDoubleJump;
     bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);
+    EventRelay<PlayerMovementSystem, Events::DashAbility> m_EDashAbility;
+    bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e);
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);

include/Game/Systems/SpawnerSystem.h

@@ -7,8 +7,7 @@
 #include "Core/System.h"
 #include "Events/ESpawnerSpawn.h"
 #include "Core/Transform.h"
-#include "Core/ResourceManager.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityFile.h"
 
 class SpawnerSystem : public System
 {

include/Game/Systems/Weapon/WeaponSystem.h

@@ -9,8 +9,8 @@
 #include "Core/EShoot.h"
 #include "Core/EPlayerSpawned.h"
 #include "Input/EInputCommand.h"
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
+#include "Core/EntityXMLFile.h"
+#include "Core/EntityXMLFileParser.h"
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Systems/SpawnerSystem.h"

resources/DefaultConfig.ini

@@ -4,7 +4,7 @@ LoadMap=
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
-RespawnTime = 8.0
+RespawnTime = -1.0
 EditorEnabled=false
 OutOfBodyExperience=false
 

resources/Schema/Components.xsd

@@ -35,7 +35,12 @@
 	<xs:include schemaLocation="Components/AmmoPickup.xsd"/>
 	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
+	<xs:include schemaLocation="Components/ShieldAbility.xsd"/>
+	<xs:include schemaLocation="Components/SprintAbility.xsd"/>
 	<xs:include schemaLocation="Components/AssaultWeapon.xsd"/>
+	<xs:include schemaLocation="Components/BoostAssault.xsd"/>
+	<xs:include schemaLocation="Components/BoostDefender.xsd"/>
+	<xs:include schemaLocation="Components/BoostSniper.xsd"/>
 	<xs:include schemaLocation="Components/Shield.xsd"/>
 	<xs:include schemaLocation="Components/Sprite.xsd"/>
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
@@ -46,8 +51,12 @@
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
+	<xs:include schemaLocation="Components/AbilityCooldownHUD.xsd"/>
 	<xs:include schemaLocation="Components/DoubleJump.xsd"/>
 	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 	<xs:include schemaLocation="Components/DefenderWeapon.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointGameMode.xsd"/>
+	<xs:include schemaLocation="Components/CapturePointArrowHUD.xsd"/>
+	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
+	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
 </xs:schema>

resources/Schema/Components/AbilityCooldownHUD.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<AbilityCooldownHUD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="AbilityCooldownHUD.xsd">
+</AbilityCooldownHUD>

resources/Schema/Components/AbilityCooldownHUD.xsd

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="AbilityCooldownHUD">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking ability cooldown. If it has a sprite and fill component it will fill the sprite with chosen color depending on the cooldown.\n A child with text component named "Cooldown"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostAssault.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<BoostAssault xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostAssault.xsd">
+  <StrengthOfEffect>2</StrengthOfEffect>
+</BoostAssault>

resources/Schema/Components/BoostAssault.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	
+	<xs:element name="BoostAssault">
+		<xs:annotation>
+			<xs:documentation>This is the assault's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostDefender.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<BoostDefender xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostDefender.xsd">
+  <StrengthOfEffect>10</StrengthOfEffect>
+</BoostDefender>

resources/Schema/Components/BoostDefender.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	
+	<xs:element name="BoostDefender">
+		<xs:annotation>
+			<xs:documentation>This is the defender's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostIconsHUD.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<BoostIconsHUD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostIconsHUD.xsd"/>

resources/Schema/Components/BoostIconsHUD.xsd

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="BoostIconsHUD">
+		<xs:annotation>
+			<xs:documentation>Origin for the 3 boost states. Create 3 children with Sprite and Fill components, name them "Sprint", "Defender", "Assault"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BoostSniper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<BoostSniper xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostSniper.xsd">
+  <StrengthOfEffect>10</StrengthOfEffect>
+</BoostSniper>

resources/Schema/Components/BoostSniper.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	
+	<xs:element name="BoostSniper">
+		<xs:annotation>
+			<xs:documentation>This is the sniper's class boost component</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the boost effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/CapturePointArrowHUD.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<CapturePointArrowHUD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CapturePointArrowHUD.xsd">
+	<CurrentTarget>0</CurrentTarget>
+</CapturePointArrowHUD>

resources/Schema/Components/CapturePointArrowHUD.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="CapturePointArrowHUD">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking next capturable Capture Point.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CurrentTarget" type="t:int" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Corresponds to the current capturepoint the arrow points Towards</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/DashAbility.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <DashAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DashAbility.xsd">
 	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+	<CoolDownTimer>0.0</CoolDownTimer>
 </DashAbility>

resources/Schema/Components/DashAbility.xsd

@@ -10,7 +10,10 @@
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the cooldown on dash</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>This is the max cooldown on dash</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="CoolDownTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the current cooldown on dash</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/FloatingEffect.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<FloatingEffect xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FloatingEffect.xsd">
+	<Period>1</Period>
+	<Amplitude>1</Amplitude>
+	<Time>0</Time>
+	<Axis X="0" Y="0" Z="0"/>
+	<Position X="0" Y="0" Z="0"/>
+</FloatingEffect>

resources/Schema/Components/FloatingEffect.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="FloatingEffect">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Period" type="t:double" minOccurs="0"/>
+				<xs:element name="Amplitude" type="t:double" minOccurs="0"/>
+				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Axis" type="t:Vector" minOccurs="0"/>
+				<xs:element name="Position" type="t:Vector" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ShieldAbility.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ShieldAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ShieldAbility.xsd">
+	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+</ShieldAbility>

resources/Schema/Components/ShieldAbility.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="ShieldAbility">
+		<xs:annotation>
+			<xs:documentation>A shield component for one of the classes</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the cooldown on shield</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/SprintAbility.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<SprintAbility xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SprintAbility.xsd">
+	<CoolDownMaxTimer>2.0</CoolDownMaxTimer>
+</SprintAbility>

resources/Schema/Components/SprintAbility.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="SprintAbility">
+		<xs:annotation>
+			<xs:documentation>A sprint component for one of the classes</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the cooldown on sprint</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Text xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Text.xsd">
 	<Content></Content>
-	<Resource></Resource>
+	<Resource>Fonts/DroidSans.ttf,64</Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<Alignment><Center/></Alignment>

resources/Schema/Entities/BoostAssault.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoostAssault/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/BoostDefender.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoostDefender/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/BoostSniper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoostSniper/>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/DashEffect.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="DashEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation/>
+    <c:Lifetime>
+      <Lifetime>0.5</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="0" Y="0" Z="0"/>
+      <TimeSinceDeath>0</TimeSinceDeath>
+      <ExplosionDuration>0.5</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="0"/>
+    </c:ExplosionEffect>
+    <c:Model/>
+    <c:Transform/>
+  </Components>
+</Entity>

resources/Schema/Entities/NewMap.xml

@@ -5019,7 +5019,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
+          <Position X="-60.3695679" Y="5.14500046" Z="-79.3789597"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5089,7 +5089,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
+          <Position X="60.0169258" Y="6.0800004" Z="76.2893906"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5165,7 +5165,7 @@
             <c:Transform>
               <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="75.6124268" Z="0"/>
+              <Orientation X="0" Y="74.6042328" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5184,7 +5184,7 @@
             <c:Transform>
               <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="72.2667694" Z="0"/>
+              <Orientation X="0" Y="71.2585754" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5203,7 +5203,7 @@
             <c:Transform>
               <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.8748016" Z="0"/>
+              <Orientation X="0" Y="68.8666077" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5222,7 +5222,7 @@
             <c:Transform>
               <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="70.1887283" Z="0"/>
+              <Orientation X="0" Y="69.180542" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5241,7 +5241,7 @@
             <c:Transform>
               <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.6374512" Z="0"/>
+              <Orientation X="0" Y="68.6292572" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5260,7 +5260,7 @@
             <c:Transform>
               <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="67.7666702" Z="0"/>
+              <Orientation X="0" Y="66.7584839" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5279,7 +5279,7 @@
             <c:Transform>
               <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="66.8154602" Z="0"/>
+              <Orientation X="0" Y="65.8073425" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>
@@ -5298,7 +5298,7 @@
             <c:Transform>
               <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
               <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="64.0265808" Z="0"/>
+              <Orientation X="0" Y="63.0184822" Z="0"/>
             </c:Transform>
             <c:Trigger/>
           </Components>

resources/Schema/Entities/Player.xml

@@ -100,12 +100,12 @@
                       <Percentage>1</Percentage>
                       <Color A="1" B="1" G="0" R="0"/>
                     </c:Fill>
-                    <c:HealthHUD/>
                     <c:Text>
                       <Content>100/100</Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
                     </c:Text>
+                    <c:HealthHUD/>
                     <c:Transform>
                       <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
                       <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
@@ -132,7 +132,70 @@
                       <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
                     </c:Transform>
                   </Components>
-                  <Children/>
+                  <Children>
+                    <Entity name="BoostIcons">
+                      <Components>
+                        <c:BoostIconsHUD/>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Assault">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Defender">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Sniper">
+                          <Components>
+                            <c:Fill>
+                              <Color A="1" B="0.345098048" G="0" R="1"/>
+                            </c:Fill>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <GlowMap></GlowMap>
+                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
+                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
                 </Entity>
               </Children>
             </Entity>
@@ -196,7 +259,6 @@
                           <CapturePointNumber>3</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Fill>
-                          <Percentage>0.80222018197612788</Percentage>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Fill>
                         <c:Sprite>
@@ -231,6 +293,7 @@
                           <CapturePointNumber>4</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Fill>
+                          <Percentage>1</Percentage>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Fill>
                         <c:Sprite>
@@ -286,7 +349,7 @@
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                       <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
+                      <Color A="0.699999988" B="0" G="0" R="1"/>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -297,7 +360,8 @@
                       <Components>
                         <c:CapturePointHUD/>
                         <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                          <Percentage>1</Percentage>
+                          <Color A="0.699999988" B="0" G="0" R="1"/>
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -306,7 +370,7 @@
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
                           <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Orientation X="0" Y="0" Z="4.71238899"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -369,6 +433,25 @@
                 </Entity>
               </Children>
             </Entity>
+            <Entity name="CapturePointArrow">
+              <Components>
+                <c:CapturePointArrowHUD/>
+                <c:Model>
+                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+                </c:Model>
+                <c:Team>
+                  <Team>
+                    <Blue/>
+                  </Team>
+                </c:Team>
+                <c:Transform>
+                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
+                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
           </Children>
         </Entity>
         <Entity name="Hands">

resources/Schema/Entities/QualityAssurance.xml

@@ -2,6 +2,9 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:CapturePointGameMode>
+      <RespawnTime>4.7473226580121377</RespawnTime>
+    </c:CapturePointGameMode>
     <c:Transform>
       <Position X="0" Y="-1" Z="0"/>
     </c:Transform>
@@ -40,7 +43,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="8433.37305" Z="0"/>
+              <Orientation X="0" Y="9038.11328" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -81,19 +84,19 @@
     </Entity>
     <Entity name="DirectionalLight">
       <Components>
+        <c:RaptorCopter>
+          <Speed>1</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
         <c:DirectionalLight>
           <Intensity>0.80000001192092896</Intensity>
         </c:DirectionalLight>
         <c:Model>
           <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
         </c:Model>
-        <c:RaptorCopter>
-          <Speed>1</Speed>
-          <Axis X="0" Y="1" Z="0"/>
-        </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="18271.9141" Z="0"/>
+          <Orientation X="4.16300011" Y="18876.6172" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -108,7 +111,11 @@
       <Children>
         <Entity name="RunAnim">
           <Components>
-            <c:Animation/>
+            <c:Animation>
+              <AnimationName1></AnimationName1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
+            </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
@@ -120,7 +127,11 @@
         </Entity>
         <Entity name="Walkanim">
           <Components>
-            <c:Animation/>
+            <c:Animation>
+              <AnimationName1></AnimationName1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
+            </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
             </c:Model>
@@ -168,13 +179,17 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2553.63574" Z="0"/>
+                  <Orientation X="0" Y="2856.05518" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
-                    <c:Animation/>
+                    <c:Animation>
+                      <AnimationName1></AnimationName1>
+                      <AnimationName2></AnimationName2>
+                      <AnimationName3></AnimationName3>
+                    </c:Animation>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
                     </c:Model>
@@ -213,7 +228,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="16862.3945" Y="16862.3945" Z="16862.3945"/>
+              <Orientation X="17467.0977" Y="17467.0977" Z="17467.0977"/>
             </c:Transform>
           </Components>
           <Children>
@@ -277,7 +292,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="16658.3906" Z="0"/>
+              <Orientation X="0" Y="17263.0938" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -309,7 +324,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="12206.665" Y="17385.8008" Z="5202.3335"/>
+                      <Orientation X="12630.0664" Y="17990.5039" Z="5383.80176"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -659,7 +674,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -706,7 +721,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -766,7 +781,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -813,7 +828,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -859,7 +874,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -906,7 +921,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -953,7 +968,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="1153.80225" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1013,6 +1028,7 @@
                   </HomePointForTeam>
                   <CaptureTimer>15</CaptureTimer>
                 </c:CapturePoint>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="0" G="0" R="1"/>
@@ -1027,7 +1043,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1063,6 +1078,7 @@
                 <c:CapturePoint>
                   <CapturePointNumber>1</CapturePointNumber>
                 </c:CapturePoint>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1073,7 +1089,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1107,6 +1122,7 @@
                 <c:CapturePoint>
                   <CapturePointNumber>2</CapturePointNumber>
                 </c:CapturePoint>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1117,7 +1133,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1153,6 +1168,7 @@
                 <c:CapturePoint>
                   <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePoint>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1163,7 +1179,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1203,6 +1218,7 @@
                   <CaptureTimer>-15</CaptureTimer>
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="0" R="0"/>
@@ -1217,7 +1233,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1367,7 +1382,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="1687.52917" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1376,7 +1391,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                      <TimeSinceDeath>2.5396116058983438</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1423,7 +1438,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="1687.52917" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1432,7 +1447,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>1.5396208215609732</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1475,18 +1490,22 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="1687.52917" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
-                    <c:Animation/>
+                    <c:Animation>
+                      <AnimationName1></AnimationName1>
+                      <AnimationName2></AnimationName2>
+                      <AnimationName3></AnimationName3>
+                    </c:Animation>
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>1.5396208215609732</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1531,7 +1550,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1392.89258" Z="0"/>
+                  <Orientation X="0" Y="1695.30933" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1541,7 +1560,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>1.2301962937648341</TimeSinceDeath>
+                      <TimeSinceDeath>4.4522528839264339</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
@@ -1589,7 +1608,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="991.007263" Z="0"/>
+                  <Orientation X="0" Y="1293.42383" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1599,7 +1618,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>3.4214855659573402</TimeSinceDeath>
+                      <TimeSinceDeath>3.2362842141074992</TimeSinceDeath>
                       <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
@@ -1690,6 +1709,7 @@
             </c:Physics>
             <c:Player>
               <MovementSpeed>5</MovementSpeed>
+              <CurrentWeapon></CurrentWeapon>
             </c:Player>
             <c:Team>
               <Team>
@@ -1712,6 +1732,7 @@
                 <Entity name="PlayerName">
                   <Components>
                     <c:Text>
+                      <Content></Content>
                       <Resource>Fonts/DroidSans.ttf,100</Resource>
                       <Color A="1" B="0" G="1" R="0"/>
                     </c:Text>
@@ -1780,7 +1801,7 @@
                         <c:ExplosionEffect>
                           <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                          <TimeSinceDeath>2.5396116058983438</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
@@ -1823,7 +1844,11 @@
             </Entity>
             <Entity name="PlayerModel">
               <Components>
-                <c:Animation/>
+                <c:Animation>
+                  <AnimationName1></AnimationName1>
+                  <AnimationName2></AnimationName2>
+                  <AnimationName3></AnimationName3>
+                </c:Animation>
                 <c:Shielded/>
                 <c:HiddenForLocalPlayer/>
                 <c:Model>
@@ -1925,6 +1950,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
+              <GlowMap></GlowMap>
             </c:Sprite>
             <c:Transform/>
           </Components>
@@ -1934,6 +1960,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
+              <GlowMap></GlowMap>
             </c:Sprite>
             <c:Transform>
               <Position X="-0.177861199" Y="0" Z="-1.04673338"/>
@@ -1954,6 +1981,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -1971,6 +1999,7 @@
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -1986,6 +2015,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2003,6 +2033,7 @@
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2018,6 +2049,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Sprite>
             <c:Transform>
@@ -2036,6 +2068,7 @@
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2051,6 +2084,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2068,6 +2102,7 @@
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2083,6 +2118,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.699999988" B="0" G="0" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2099,6 +2135,7 @@
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2167,6 +2204,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0" Y="0" Z="-1"/>
@@ -2178,6 +2216,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.388422519" Z="0.0627754927"/>
@@ -2206,6 +2245,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.214031488" Z="0.0627754927"/>
@@ -2234,6 +2274,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
@@ -2262,6 +2303,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
@@ -2290,6 +2332,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
@@ -2331,6 +2374,7 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0" Y="0" Z="-1"/>
@@ -2342,6 +2386,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.375197947" Z="0.0627754927"/>
@@ -2370,6 +2415,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.199327558" Z="0.0627754927"/>
@@ -2398,6 +2444,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
@@ -2426,6 +2473,7 @@
                         <c:Button/>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.164955258" Z="0.0627754927"/>
@@ -2482,6 +2530,36 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity>
+      <Components>
+        <c:Team/>
+        <c:Transform>
+          <Position X="9.42733288" Y="8.22214794" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="CapturePointArrow">
+          <Components>
+            <c:CapturePointArrowHUD>
+              <CurrentTarget>2</CurrentTarget>
+            </c:CapturePointArrowHUD>
+            <c:Model>
+              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+            </c:Model>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
+            <c:Transform>
+              <Scale X="10.7000008" Y="1.4000001" Z="5.30000019"/>
+              <Orientation X="-0.648448348" Y="-0.417814791" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/SpectatorCamera.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SpectatorCamera" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Camera/>
+    <c:Transform>
+      <Position X="0" Y="0" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="SpectatorHUD">
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="RespawnTimer">
+          <Components>
+            <c:Text>
+              <Content>Time to respawn: 0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="1" R="0.784313738"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-0.115000000" Y="0.15304254" Z="0"/>
+              <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="CapturePointHUD">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0.190541431" Z="0"/>
+              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0.919596612" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="ProgressionHexagon">
+                  <Components>
+                    <c:CapturePointHUD>
+                      <CapturePointNumber>2</CapturePointNumber>
+                    </c:CapturePointHUD>
+                    <c:Fill>
+                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.00999999978"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="ProgressionHexagon">
+                  <Components>
+                    <c:CapturePointHUD>
+                      <CapturePointNumber>3</CapturePointNumber>
+                    </c:CapturePointHUD>
+                    <c:Fill>
+                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.00999999978"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="1.62788737" Y="0.919596612" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="ProgressionHexagon">
+                  <Components>
+                    <c:CapturePointHUD>
+                      <CapturePointNumber>4</CapturePointNumber>
+                    </c:CapturePointHUD>
+                    <c:Fill>
+                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.00999999978"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="ProgressionHexagon">
+                  <Components>
+                    <c:CapturePointHUD>
+                      <CapturePointNumber>1</CapturePointNumber>
+                    </c:CapturePointHUD>
+                    <c:Fill>
+                      <Percentage>0.59265931447347009</Percentage>
+                      <Color A="0.699999988" B="0" G="0" R="1"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.00999999978"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="4.71238899"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BackgroundHexagon">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <Color A="0.699999988" B="0" G="0" R="1"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="-1.58304751" Y="0.919596612" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="ProgressionHexagon">
+                  <Components>
+                    <c:CapturePointHUD/>
+                    <c:Fill>
+                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.00999999978"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                      <Orientation X="0" Y="0" Z="1.57079637"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Types/Entity.xsd

@@ -51,7 +51,17 @@
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
 							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
+							<xs:element ref="c:AbilityCooldownHUD" minOccurs="0"/>
 							<xs:element ref="c:DefenderWeapon" minOccurs="0"/>
+							<xs:element ref="c:CapturePointArrowHUD" minOccurs="0"/>
+							<xs:element ref="c:BoostIconsHUD" minOccurs="0"/>
+							<xs:element ref="c:FloatingEffect" minOccurs="0"/>
+							<xs:element ref="c:AmmoPickup" minOccurs="0"/>
+							<xs:element ref="c:HealthPickup" minOccurs="0"/>
+							<xs:element ref="c:CapturePointGameMode" minOccurs="0"/>
+							<xs:element ref="c:DoubleJump" minOccurs="0"/>
+							<xs:element ref="c:HealthHUD" minOccurs="0"/>
+							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlusSplatMapRGBShieldCheck.frag.glsl

@@ -40,7 +40,6 @@ layout (binding = 10) uniform sampler2D SpecularMapTexture3;
 layout (binding = 11) uniform sampler2D GlowMapTexture1;
 layout (binding = 12) uniform sampler2D GlowMapTexture2;
 layout (binding = 13) uniform sampler2D GlowMapTexture3;
-layout (binding = 13) uniform sampler2D GlowMapTexture3;
 layout (binding = 31) uniform samplerCube ShieldBuffer;
 
 #define TILE_SIZE 16

src/Engine/Core/EntityFile.cpp

@@ -1,291 +1,25 @@
 #include "Core/EntityFile.h"
 
-EntityFile::EntityFile(boost::filesystem::path path)
-    : m_FilePath(path)
+EntityFile::EntityFile(std::string path)
 {
-    using namespace xercesc;
-    XMLPlatformUtils::Initialize();
-    m_GrammarPool = new XMLGrammarPoolImpl();
-    m_SAX2XMLReader = XMLReaderFactory::createXMLReader(XMLPlatformUtils::fgMemoryManager, m_GrammarPool);
-}
+    EntityXMLFile* xml = ResourceManager::Load<EntityXMLFile>(path);
 
-EntityFile::~EntityFile()
-{
-    delete m_SAX2XMLReader;
-    delete m_GrammarPool;
-    xercesc::XMLPlatformUtils::Terminate();
-}
+    EntityXMLFilePreprocessor preprocessor(xml);
+    preprocessor.RegisterComponents(this);
 
-void EntityFile::Parse(const EntityFileHandler* handler) const
-{
-    using namespace xercesc;
+    EntityXMLFileParser parser(xml);
+    m_RootEntity = parser.MergeEntities(this);
 
-    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
-    setReaderFeatures(m_SAX2XMLReader);
-    m_SAX2XMLReader->setContentHandler(&saxHandler);
-    m_SAX2XMLReader->setErrorHandler(&saxHandler);
-    m_SAX2XMLReader->setDeclarationHandler(&saxHandler);
-    m_SAX2XMLReader->parse(m_FilePath.string().c_str());
-}
-
-void EntityFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
-{
-    using namespace xercesc;
-    reader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true);
-    reader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true);
-    reader->setFeature(XMLUni::fgSAX2CoreValidation, true);
-    reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
-    reader->setFeature(XMLUni::fgXercesSchema, true);
-    reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
-    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
-    reader->setFeature(XMLUni::fgXercesIdentityConstraintChecking, true);
-}
-
-unsigned int EntityFile::GetTypeStride(std::string typeName)
-{
-    std::map<std::string, unsigned int> typeStrides{
-        { "bool", sizeof(bool) },
-        { "int", sizeof(int) },
-        { "float", sizeof(float) },
-        { "double", sizeof(double) },
-        { "string", sizeof(std::string) },
-        { "enum", sizeof(ComponentInfo::EnumType) },
-        { "Vector", sizeof(glm::vec3) },
-        { "Quaternion", sizeof(glm::quat) },
-        { "Color", sizeof(glm::vec4) }
-    };
-
-    auto it = typeStrides.find(typeName);
-    return (it != typeStrides.end()) ? it->second : 0;
-}
-
-void EntityFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes)
-{
-    if (field.Type == "Vector") {
-        glm::vec3 vec;
-        vec.x = boost::lexical_cast<float>(attributes.at("X"));
-        vec.y = boost::lexical_cast<float>(attributes.at("Y"));
-        vec.z = boost::lexical_cast<float>(attributes.at("Z"));
-        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
-    } else if (field.Type == "Color") {
-        glm::vec4 vec;
-        vec.r = boost::lexical_cast<float>(attributes.at("R"));
-        vec.g = boost::lexical_cast<float>(attributes.at("G"));
-        vec.b = boost::lexical_cast<float>(attributes.at("B"));
-        vec.a = boost::lexical_cast<float>(attributes.at("A"));
-        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
-    } else if (field.Type == "Quaternion") {
-        glm::quat q;
-        q.x = boost::lexical_cast<float>(attributes.at("X"));
-        q.y = boost::lexical_cast<float>(attributes.at("Y"));
-        q.z = boost::lexical_cast<float>(attributes.at("Z"));
-        q.w = boost::lexical_cast<float>(attributes.at("W"));
-        memcpy(outData, reinterpret_cast<char*>(&q), field.Stride);
-    } else if (!attributes.empty()) {
-        LOG_WARNING("%i attributes not handled by any type conversion!", attributes.size());
-    }
-}
-
-void EntityFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData)
-{
-    // Catch and ignore casting errors so whitespace around string enums won't mess anything up
-    try {
-        if (field.Type == "int") {
-            int value = boost::lexical_cast<int>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "enum") {
-            ComponentInfo::EnumType value = boost::lexical_cast<ComponentInfo::EnumType>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "float") {
-            float value = boost::lexical_cast<float>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "double") {
-            double value = boost::lexical_cast<double>(valueData);
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "bool") {
-            bool value = (valueData[0] == 't'); // Lazy bool evaluation
-            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
-        } else if (field.Type == "string") {
-            new (outData) std::string(valueData);
-        } else {
-            LOG_WARNING("Unknown value data type: %s", field.Type.c_str());
-        }
-    } catch (const boost::bad_lexical_cast&) { }
-}
-
-EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
-    : m_Handler(handler)
-    , m_Reader(reader)
-{
-    // 0 is imaginary base parent
-    m_EntityStack.push(0);
-    m_StateStack.push(State::Unknown);
-}
-
-void EntityFileSAXHandler::startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs)
-{
-    std::string name = XS::ToString(_localName);
-
-    if (m_StateStack.top() == State::Unknown || m_StateStack.top() == State::Entity) {
-        if (name == "Entity") {
-            m_StateStack.push(State::Entity);
-            onStartEntity(attrs);
-            return;
-        }
-        if (name == "EntityRef") {
-            onStartEntityRef(attrs);
-            return;
-        }
+    if (m_RootEntity == EntityID_Invalid) {
+        ResourceManager::Release("EntityXMLFile", path);
+        throw Resource::FailedLoadingException("Failed to merge entities; root entity is invalid");
     }
 
-    std::string uri = XS::ToString(_uri);
-    if (m_StateStack.top() == State::Entity) {
-        if (uri == "components") {
-            m_StateStack.push(State::Component);
-            onStartComponent(name);
-            return;
-        }
-    }
-
-    if (m_StateStack.top() == State::Component) {
-        m_StateStack.push(State::ComponentField);
-        onStartComponentField(name, attrs);
-        return;
-    }
+    ResourceManager::Release("EntityXMLFile", path);
 }
 
-void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname)
+EntityWrapper EntityFile::MergeInto(World* other)
 {
-    std::string name = XS::ToString(_localName);
-    if (m_StateStack.top() == State::Entity) {
-        if (name == "Entity") {
-            m_StateStack.pop();
-            onEndEntity();
-            return;
-        }
-    }
-
-    std::string uri = XS::ToString(_uri);
-    if (m_StateStack.top() == State::Component) {
-        //if (uri == "components") {
-        m_StateStack.pop();
-        onEndComponent(name);
-        return;
-        //}
-    }
-
-    if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
-        m_StateStack.pop();
-        onEndComponentField(name);
-        return;
-    }
-}
-
-void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t length)
-{
-    if (m_StateStack.top() == State::ComponentField) {
-        char* transcoded = xercesc::XMLString::transcode(chars);
-        onFieldData(transcoded);
-    }
-}
-
-void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
-{
-    std::string message = XS::ToString(e.getMessage());
-    std::string systemId = XS::ToString(e.getSystemId());
-    XMLFileLoc line = e.getLineNumber();
-    XMLFileLoc column = e.getColumnNumber();
-    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
-}
-
-void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)
-{
-    EntityID parent = m_EntityStack.top();
-
-    if (m_Handler->m_OnStartEntityCallback) {
-        std::string name;
-        auto xName = attrs.getValue(XS::ToXMLCh("name"));
-        if (xName != nullptr) {
-            name = XS::ToString(xName);
-        }
-        m_Handler->m_OnStartEntityCallback(m_NextEntityID, parent, name);
-    }
-
-    m_EntityStack.push(m_NextEntityID);
-    m_NextEntityID++;
-}
-
-void EntityFileSAXHandler::onEndEntity()
-{
-    m_EntityStack.pop();
-}
-
-void EntityFileSAXHandler::onStartEntityRef(const xercesc::Attributes& attrs)
-{
-    std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file")));
-
-    xercesc::SAX2XMLReader* reader = xercesc::XMLReaderFactory::createXMLReader();
-    EntityFile::setReaderFeatures(reader);
-    reader->setContentHandler(this);
-    reader->setErrorHandler(this);
-    reader->parse(path.c_str());
-    delete reader;
-}
-
-void EntityFileSAXHandler::onStartComponentField(const std::string& field, const xercesc::Attributes& attrs)
-{
-    //LOG_DEBUG("        Field: %s", field.c_str());
-    m_CurrentField = field;
-    m_CurrentAttributes.clear();
-    for (int i = 0; i < attrs.getLength(); i++) {
-        auto name = attrs.getQName(i);
-        auto value = attrs.getValue(name);
-        //LOG_DEBUG("            %s = %s", (char*)XS::ToString(name), (char*)XS::ToString(value));
-        m_CurrentAttributes[XS::ToString(name).operator std::string()] = XS::ToString(value).operator std::string();
-    }
-
-    if (m_Handler->m_OnStartFieldCallback) {
-        m_Handler->m_OnStartFieldCallback(m_EntityStack.top(), m_CurrentComponent, field, m_CurrentAttributes);
-    }
-}
-
-void EntityFileSAXHandler::onEndComponent(const std::string& name) { }
-
-void EntityFileSAXHandler::onStartComponent(const std::string& name)
-{
-    //LOG_DEBUG("    Component: %s", name.c_str());
-    m_CurrentComponent = name;
-    if (m_Handler->m_OnStartComponentCallback) {
-        m_Handler->m_OnStartComponentCallback(m_EntityStack.top(), name);
-    }
-}
-
-void EntityFileSAXHandler::onEndComponentField(const std::string& field) { }
-
-void EntityFileSAXHandler::onFieldData(char* data)
-{
-    //LOG_DEBUG("            Data: %s", data);
-    if (m_Handler->m_OnStartFieldDataCallback) {
-        m_Handler->m_OnStartFieldDataCallback(m_EntityStack.top(), m_CurrentComponent, m_CurrentField, data);
-    }
-
-    xercesc::XMLString::release(&data);
-}
+    auto mapping = other->Merge(this);
+    return EntityWrapper(other, mapping.at(m_RootEntity));
+}

src/Engine/Core/EntityFileParser.cpp

@@ -1,74 +0,0 @@
-#include "Core/EntityFileParser.h"
-
-EntityFileParser::EntityFileParser(const EntityFile* entityFile) 
-    : m_EntityFile(entityFile)
-{
-    m_Handler.SetStartEntityCallback(std::bind(&EntityFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-    m_Handler.SetStartComponentCallback(std::bind(&EntityFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
-    m_Handler.SetStartFieldCallback(std::bind(&EntityFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-    m_Handler.SetStartFieldDataCallback(std::bind(&EntityFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-}
-
-EntityID EntityFileParser::MergeEntities(World* world, EntityID baseParent /*= EntityID_Invalid */)
-{
-    m_World = world;
-    m_EntityIDMapper[0] = baseParent;
-    m_EntityFile->Parse(&m_Handler);
-    return m_FirstEntity;
-}
-
-void EntityFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name)
-{
-    EntityID realParent = m_EntityIDMapper.at(parent);
-    EntityID realEntity = m_World->CreateEntity(realParent);
-    if (m_FirstEntity == EntityID_Invalid) {
-        m_FirstEntity = realEntity;
-    }
-    if (!name.empty()) {
-        m_World->SetName(realEntity, name);
-    }
-    m_EntityIDMapper[entity] = realEntity;
-    //LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
-}
-
-void EntityFileParser::onStartComponent(EntityID entity, const std::string& component)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    m_World->AttachComponent(realEntity, component);
-    //LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
-}
-
-void EntityFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
-    auto fieldIt = component.Info.Fields.find(fieldName);
-    if (fieldIt == component.Info.Fields.end()) {
-        LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str());
-        return;
-    }
-    auto& field = fieldIt->second;
-
-    //LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
-    //LOG_DEBUG("Attributes:");
-    //for (auto& kv : attributes) {
-    //    LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str());
-    //}
-
-    char* data = component.Data + field.Offset;
-    EntityFile::WriteAttributeData(data, field, attributes);
-}
-
-void EntityFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData)
-{
-    EntityID realEntity = m_EntityIDMapper.at(entity);
-    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
-    auto fieldIt = component.Info.Fields.find(fieldName);
-    if (fieldIt == component.Info.Fields.end()) {
-        return;
-    }
-    auto& field = fieldIt->second;
-
-    char* data = component.Data + field.Offset;
-    EntityFile::WriteValueData(data, field, fieldData);
-}

src/Engine/Core/EntityXMLFile.cpp

@@ -0,0 +1,291 @@
+#include "Core/EntityXMLFile.h"
+
+EntityXMLFile::EntityXMLFile(boost::filesystem::path path)
+    : m_FilePath(path)
+{
+    using namespace xercesc;
+    XMLPlatformUtils::Initialize();
+    m_GrammarPool = new XMLGrammarPoolImpl();
+    m_SAX2XMLReader = XMLReaderFactory::createXMLReader(XMLPlatformUtils::fgMemoryManager, m_GrammarPool);
+}
+
+EntityXMLFile::~EntityXMLFile()
+{
+    delete m_SAX2XMLReader;
+    delete m_GrammarPool;
+    xercesc::XMLPlatformUtils::Terminate();
+}
+
+void EntityXMLFile::Parse(const EntityFileHandler* handler) const
+{
+    using namespace xercesc;
+
+    EntityFileSAXHandler saxHandler(handler, m_SAX2XMLReader);
+    setReaderFeatures(m_SAX2XMLReader);
+    m_SAX2XMLReader->setContentHandler(&saxHandler);
+    m_SAX2XMLReader->setErrorHandler(&saxHandler);
+    m_SAX2XMLReader->setDeclarationHandler(&saxHandler);
+    m_SAX2XMLReader->parse(m_FilePath.string().c_str());
+}
+
+void EntityXMLFile::setReaderFeatures(xercesc::SAX2XMLReader* reader)
+{
+    using namespace xercesc;
+    reader->setFeature(XMLUni::fgXercesCacheGrammarFromParse, true);
+    reader->setFeature(XMLUni::fgXercesUseCachedGrammarInParse, true);
+    reader->setFeature(XMLUni::fgSAX2CoreValidation, true);
+    reader->setFeature(XMLUni::fgSAX2CoreNameSpaces, true);
+    reader->setFeature(XMLUni::fgXercesSchema, true);
+    reader->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
+    reader->setFeature(XMLUni::fgXercesCalculateSrcOfs, true);
+    reader->setFeature(XMLUni::fgXercesIdentityConstraintChecking, true);
+}
+
+unsigned int EntityXMLFile::GetTypeStride(std::string typeName)
+{
+    std::map<std::string, unsigned int> typeStrides{
+        { "bool", sizeof(bool) },
+        { "int", sizeof(int) },
+        { "float", sizeof(float) },
+        { "double", sizeof(double) },
+        { "string", sizeof(std::string) },
+        { "enum", sizeof(ComponentInfo::EnumType) },
+        { "Vector", sizeof(glm::vec3) },
+        { "Quaternion", sizeof(glm::quat) },
+        { "Color", sizeof(glm::vec4) }
+    };
+
+    auto it = typeStrides.find(typeName);
+    return (it != typeStrides.end()) ? it->second : 0;
+}
+
+void EntityXMLFile::WriteAttributeData(char* outData, const ComponentInfo::Field_t& field, const std::map<std::string, std::string>& attributes)
+{
+    if (field.Type == "Vector") {
+        glm::vec3 vec;
+        vec.x = boost::lexical_cast<float>(attributes.at("X"));
+        vec.y = boost::lexical_cast<float>(attributes.at("Y"));
+        vec.z = boost::lexical_cast<float>(attributes.at("Z"));
+        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
+    } else if (field.Type == "Color") {
+        glm::vec4 vec;
+        vec.r = boost::lexical_cast<float>(attributes.at("R"));
+        vec.g = boost::lexical_cast<float>(attributes.at("G"));
+        vec.b = boost::lexical_cast<float>(attributes.at("B"));
+        vec.a = boost::lexical_cast<float>(attributes.at("A"));
+        memcpy(outData, reinterpret_cast<char*>(&vec), field.Stride);
+    } else if (field.Type == "Quaternion") {
+        glm::quat q;
+        q.x = boost::lexical_cast<float>(attributes.at("X"));
+        q.y = boost::lexical_cast<float>(attributes.at("Y"));
+        q.z = boost::lexical_cast<float>(attributes.at("Z"));
+        q.w = boost::lexical_cast<float>(attributes.at("W"));
+        memcpy(outData, reinterpret_cast<char*>(&q), field.Stride);
+    } else if (!attributes.empty()) {
+        LOG_WARNING("%i attributes not handled by any type conversion!", attributes.size());
+    }
+}
+
+void EntityXMLFile::WriteValueData(char* outData, const ComponentInfo::Field_t& field, const char* valueData)
+{
+    // Catch and ignore casting errors so whitespace around string enums won't mess anything up
+    try {
+        if (field.Type == "int") {
+            int value = boost::lexical_cast<int>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "enum") {
+            ComponentInfo::EnumType value = boost::lexical_cast<ComponentInfo::EnumType>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "float") {
+            float value = boost::lexical_cast<float>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "double") {
+            double value = boost::lexical_cast<double>(valueData);
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "bool") {
+            bool value = (valueData[0] == 't'); // Lazy bool evaluation
+            memcpy(outData, reinterpret_cast<char*>(&value), field.Stride);
+        } else if (field.Type == "string") {
+            new (outData) std::string(valueData);
+        } else {
+            LOG_WARNING("Unknown value data type: %s", field.Type.c_str());
+        }
+    } catch (const boost::bad_lexical_cast&) { }
+}
+
+EntityFileSAXHandler::EntityFileSAXHandler(const EntityFileHandler* handler, xercesc::SAX2XMLReader* reader) 
+    : m_Handler(handler)
+    , m_Reader(reader)
+{
+    // 0 is imaginary base parent
+    m_EntityStack.push(0);
+    m_StateStack.push(State::Unknown);
+}
+
+void EntityFileSAXHandler::startElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname, const xercesc::Attributes& attrs)
+{
+    std::string name = XS::ToString(_localName);
+
+    if (m_StateStack.top() == State::Unknown || m_StateStack.top() == State::Entity) {
+        if (name == "Entity") {
+            m_StateStack.push(State::Entity);
+            onStartEntity(attrs);
+            return;
+        }
+        if (name == "EntityRef") {
+            onStartEntityRef(attrs);
+            return;
+        }
+    }
+
+    std::string uri = XS::ToString(_uri);
+    if (m_StateStack.top() == State::Entity) {
+        if (uri == "components") {
+            m_StateStack.push(State::Component);
+            onStartComponent(name);
+            return;
+        }
+    }
+
+    if (m_StateStack.top() == State::Component) {
+        m_StateStack.push(State::ComponentField);
+        onStartComponentField(name, attrs);
+        return;
+    }
+}
+
+void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* const _localName, const XMLCh* const _qname)
+{
+    std::string name = XS::ToString(_localName);
+    if (m_StateStack.top() == State::Entity) {
+        if (name == "Entity") {
+            m_StateStack.pop();
+            onEndEntity();
+            return;
+        }
+    }
+
+    std::string uri = XS::ToString(_uri);
+    if (m_StateStack.top() == State::Component) {
+        //if (uri == "components") {
+        m_StateStack.pop();
+        onEndComponent(name);
+        return;
+        //}
+    }
+
+    if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
+        m_StateStack.pop();
+        onEndComponentField(name);
+        return;
+    }
+}
+
+void EntityFileSAXHandler::characters(const XMLCh* const chars, const XMLSize_t length)
+{
+    if (m_StateStack.top() == State::ComponentField) {
+        char* transcoded = xercesc::XMLString::transcode(chars);
+        onFieldData(transcoded);
+    }
+}
+
+void EntityFileSAXHandler::fatalError(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tFatal Error: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::error(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tError: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::warning(const xercesc::SAXParseException& e)
+{
+    std::string message = XS::ToString(e.getMessage());
+    std::string systemId = XS::ToString(e.getSystemId());
+    XMLFileLoc line = e.getLineNumber();
+    XMLFileLoc column = e.getColumnNumber();
+    LOG_ERROR("SAXParseException\n\tLocation: %s:%i:%i\n\tWarning: %s", systemId.c_str(), line, column, message.c_str());
+}
+
+void EntityFileSAXHandler::onStartEntity(const xercesc::Attributes& attrs)
+{
+    EntityID parent = m_EntityStack.top();
+
+    if (m_Handler->m_OnStartEntityCallback) {
+        std::string name;
+        auto xName = attrs.getValue(XS::ToXMLCh("name"));
+        if (xName != nullptr) {
+            name = XS::ToString(xName);
+        }
+        m_Handler->m_OnStartEntityCallback(m_NextEntityID, parent, name);
+    }
+
+    m_EntityStack.push(m_NextEntityID);
+    m_NextEntityID++;
+}
+
+void EntityFileSAXHandler::onEndEntity()
+{
+    m_EntityStack.pop();
+}
+
+void EntityFileSAXHandler::onStartEntityRef(const xercesc::Attributes& attrs)
+{
+    std::string path = XS::ToString(attrs.getValue(XS::ToXMLCh("file")));
+
+    xercesc::SAX2XMLReader* reader = xercesc::XMLReaderFactory::createXMLReader();
+    EntityXMLFile::setReaderFeatures(reader);
+    reader->setContentHandler(this);
+    reader->setErrorHandler(this);
+    reader->parse(path.c_str());
+    delete reader;
+}
+
+void EntityFileSAXHandler::onStartComponentField(const std::string& field, const xercesc::Attributes& attrs)
+{
+    //LOG_DEBUG("        Field: %s", field.c_str());
+    m_CurrentField = field;
+    m_CurrentAttributes.clear();
+    for (int i = 0; i < attrs.getLength(); i++) {
+        auto name = attrs.getQName(i);
+        auto value = attrs.getValue(name);
+        //LOG_DEBUG("            %s = %s", (char*)XS::ToString(name), (char*)XS::ToString(value));
+        m_CurrentAttributes[XS::ToString(name).operator std::string()] = XS::ToString(value).operator std::string();
+    }
+
+    if (m_Handler->m_OnStartFieldCallback) {
+        m_Handler->m_OnStartFieldCallback(m_EntityStack.top(), m_CurrentComponent, field, m_CurrentAttributes);
+    }
+}
+
+void EntityFileSAXHandler::onEndComponent(const std::string& name) { }
+
+void EntityFileSAXHandler::onStartComponent(const std::string& name)
+{
+    //LOG_DEBUG("    Component: %s", name.c_str());
+    m_CurrentComponent = name;
+    if (m_Handler->m_OnStartComponentCallback) {
+        m_Handler->m_OnStartComponentCallback(m_EntityStack.top(), name);
+    }
+}
+
+void EntityFileSAXHandler::onEndComponentField(const std::string& field) { }
+
+void EntityFileSAXHandler::onFieldData(char* data)
+{
+    //LOG_DEBUG("            Data: %s", data);
+    if (m_Handler->m_OnStartFieldDataCallback) {
+        m_Handler->m_OnStartFieldDataCallback(m_EntityStack.top(), m_CurrentComponent, m_CurrentField, data);
+    }
+
+    xercesc::XMLString::release(&data);
+}

src/Engine/Core/EntityXMLFileParser.cpp

@@ -0,0 +1,84 @@
+#include "Core/EntityXMLFileParser.h"
+
+EntityXMLFileParser::EntityXMLFileParser(const EntityXMLFile* entityFile)
+    : m_EntityFile(entityFile)
+{
+    m_Handler.SetStartEntityCallback(std::bind(&EntityXMLFileParser::onStartEntity, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+    m_Handler.SetStartComponentCallback(std::bind(&EntityXMLFileParser::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
+    m_Handler.SetStartFieldCallback(std::bind(&EntityXMLFileParser::onStartComponentField, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+    m_Handler.SetStartFieldDataCallback(std::bind(&EntityXMLFileParser::onFieldData, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+}
+
+EntityID EntityXMLFileParser::MergeEntities(World* world, EntityID baseParent /*= EntityID_Invalid */)
+{
+    m_World = world;
+    m_EntityIDMapper[0] = baseParent;
+    m_EntityFile->Parse(&m_Handler);
+    return m_FirstEntity;
+}
+
+void EntityXMLFileParser::onStartEntity(EntityID entity, EntityID parent, const std::string& name)
+{
+    EntityID realParent = m_EntityIDMapper.at(parent);
+    EntityID realEntity = m_World->CreateEntity(realParent);
+    if (m_FirstEntity == EntityID_Invalid) {
+        m_FirstEntity = realEntity;
+    }
+    if (!name.empty()) {
+        m_World->SetName(realEntity, name);
+    }
+    m_EntityIDMapper[entity] = realEntity;
+    //LOG_DEBUG("Created entity #%i (%i) with parent %i (%i)", entity, realEntity, parent, realParent);
+}
+
+void EntityXMLFileParser::onStartComponent(EntityID entity, const std::string& component)
+{
+    if (m_World->GetComponentPools().count(component) != 0) {
+        EntityID realEntity = m_EntityIDMapper.at(entity);
+        m_World->AttachComponent(realEntity, component);
+    } else {
+        LOG_ERROR("Tried to attach unregistered component \"%s\"! to entity #%i. Ignoring.", component.c_str(), entity);
+    }
+    //LOG_DEBUG("Attached component of type \"%s\" to entity #%i (%i)", component.c_str(), entity, realEntity);
+}
+
+void EntityXMLFileParser::onStartComponentField(EntityID entity, const std::string& componentType, const std::string& fieldName, const std::map<std::string, std::string>& attributes)
+{
+    if (m_World->GetComponentPools().count(componentType) == 0) {
+        return;
+    }
+    EntityID realEntity = m_EntityIDMapper.at(entity);
+    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
+    auto fieldIt = component.Info.Fields.find(fieldName);
+    if (fieldIt == component.Info.Fields.end()) {
+        LOG_ERROR("Tried to set unknown field \"%s\" of component type \"%s\"! Ignoring.", fieldName.c_str(), componentType.c_str());
+        return;
+    }
+    auto& field = fieldIt->second;
+
+    //LOG_DEBUG("Field \"%s\" type \"%s\"", fieldName.c_str(), field.Type.c_str());
+    //LOG_DEBUG("Attributes:");
+    //for (auto& kv : attributes) {
+    //    LOG_DEBUG("\t%s = %s", kv.first.c_str(), kv.second.c_str());
+    //}
+
+    char* data = component.Data + field.Offset;
+    EntityXMLFile::WriteAttributeData(data, field, attributes);
+}
+
+void EntityXMLFileParser::onFieldData(EntityID entity, const std::string& componentType, const std::string& fieldName, const char* fieldData)
+{
+    if (m_World->GetComponentPools().count(componentType) == 0) {
+        return;
+    }
+    EntityID realEntity = m_EntityIDMapper.at(entity);
+    ComponentWrapper component = m_World->GetComponent(realEntity, componentType);
+    auto fieldIt = component.Info.Fields.find(fieldName);
+    if (fieldIt == component.Info.Fields.end()) {
+        return;
+    }
+    auto& field = fieldIt->second;
+
+    char* data = component.Data + field.Offset;
+    EntityXMLFile::WriteValueData(data, field, fieldData);
+}

src/Engine/Core/EntityXMLFilePreprocessor.cpp

@@ -1,10 +1,10 @@
-#include "Core/EntityFilePreprocessor.h"
+#include "Core/EntityXMLFilePreprocessor.h"
 
-EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile) 
+EntityXMLFilePreprocessor::EntityXMLFilePreprocessor(const EntityXMLFile* entityFile) 
     : m_EntityFile(entityFile)
 {
     EntityFileHandler handler;
-    handler.SetStartComponentCallback(std::bind(&EntityFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
+    handler.SetStartComponentCallback(std::bind(&EntityXMLFilePreprocessor::onStartComponent, this, std::placeholders::_1, std::placeholders::_2));
     m_EntityFile->Parse(&handler);
 
     //LOG_DEBUG("___ COMPONENT DEFINITIONS ___");
@@ -28,20 +28,20 @@ EntityFilePreprocessor::EntityFilePreprocessor(const EntityFile* entityFile)
     parseDefaults();
 }
 
-void EntityFilePreprocessor::RegisterComponents(World* world)
+void EntityXMLFilePreprocessor::RegisterComponents(World* world)
 {
     for (auto& kv : m_ComponentInfo) {
         world->RegisterComponent(kv.second);
     }
 }
 
-void EntityFilePreprocessor::onStartComponent(EntityID entity, std::string type)
+void EntityXMLFilePreprocessor::onStartComponent(EntityID entity, std::string type)
 {
     //LOG_DEBUG("Component: %s", type.c_str());
     m_ComponentCounts[type]++;
 }
 
-void EntityFilePreprocessor::parseComponentInfo()
+void EntityXMLFilePreprocessor::parseComponentInfo()
 {
     using namespace xercesc;
     EntityFileXMLErrorHandler errorHandler;
@@ -141,9 +141,9 @@ void EntityFilePreprocessor::parseComponentInfo()
             std::string baseType = XS::ToString(elementDeclaration->getTypeDefinition()->getBaseType()->getName());
 
             std::string effectiveType = type;
-            unsigned int stride = EntityFile::GetTypeStride(type);
+            unsigned int stride = EntityXMLFile::GetTypeStride(type);
             if (stride == 0) {
-                stride = EntityFile::GetTypeStride(baseType);
+                stride = EntityXMLFile::GetTypeStride(baseType);
                 if (stride == 0) {
                     LOG_WARNING("Field \"%s\" in component \"%s\" uses unexpected field type \"%s\" with base type \"%s\". Skipping.", name.c_str(), compInfo.Name.c_str(), type.c_str(), baseType.c_str());
                     continue;
@@ -196,7 +196,7 @@ void EntityFilePreprocessor::parseComponentInfo()
     }
 }
 
-void EntityFilePreprocessor::parseDefaults()
+void EntityXMLFilePreprocessor::parseDefaults()
 {
     using namespace xercesc;
 
@@ -261,7 +261,7 @@ void EntityFilePreprocessor::parseDefaults()
                     auto attribItem = attributeMap->item(i);
                     attributes[XS::ToString(attribItem->getNodeName())] = XS::ToString(attribItem->getNodeValue());
                 }
-                EntityFile::WriteAttributeData(data, field, attributes);
+                EntityXMLFile::WriteAttributeData(data, field, attributes);
             }
 
             auto childNode = fieldElement->getFirstChild();
@@ -278,14 +278,14 @@ void EntityFilePreprocessor::parseDefaults()
             // Handle potential field values
             if (childNode->getNodeType() == DOMNode::TEXT_NODE) {
                 char* cstrValue = XMLString::transcode(childNode->getNodeValue());
-                EntityFile::WriteValueData(data, field, cstrValue);
+                EntityXMLFile::WriteValueData(data, field, cstrValue);
                 XMLString::release(&cstrValue);
             }
         }
     }
 }
 
-std::string EntityFilePreprocessor::parseAnnotationXML(const XMLCh* xml)
+std::string EntityXMLFilePreprocessor::parseAnnotationXML(const XMLCh* xml)
 {
     using namespace xercesc;
 

src/Engine/Core/EntityXMLFileWriter.cpp

@@ -1,13 +1,13 @@
-#include "Core/EntityFileWriter.h"
+#include "Core/EntityXMLFileWriter.h"
 
 #define X(str) XS::ToXMLCh(str)
 
-void EntityFileWriter::WriteWorld(World* world)
+void EntityXMLFileWriter::WriteWorld(World* world)
 {
     WriteEntity(world, 0);
 }
 
-void EntityFileWriter::WriteEntity(World* world, EntityID entity)
+void EntityXMLFileWriter::WriteEntity(World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = m_DOMImplementation->createDocument(nullptr, X("Entity"), nullptr);
@@ -41,7 +41,7 @@ void EntityFileWriter::WriteEntity(World* world, EntityID entity)
     doc->release();
 }
 
-void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
+void EntityXMLFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = parentElement->getOwnerDocument();
@@ -67,7 +67,7 @@ void EntityFileWriter::appendEntityChildren(xercesc::DOMElement* parentElement,
     }
 }
 
-void EntityFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
+void EntityXMLFileWriter::appentEntityComponents(xercesc::DOMElement* parentElement, const World* world, EntityID entity)
 {
     using namespace xercesc;
     DOMDocument* doc = parentElement->getOwnerDocument();

src/Engine/Core/Util/Logging.cpp

@@ -33,8 +33,8 @@ void _LOG(_LOG_LEVEL logLevel, const char* file, const char* func, unsigned int
 	va_end(args);
 
 	if (logLevel == LOG_LEVEL_ERROR) {
-		//std::cerr << file << ":" << line << " " << func << std::endl;
-		//std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
+		std::cerr << file << ":" << line << " " << func << std::endl;
+		std::cerr << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
 	} else {
 		std::cout << _LOG_LEVEL_PREFIX[logLevel] << message << std::endl;
 	}

src/Engine/Core/World.cpp

@@ -1,6 +1,7 @@
 #include "Core/World.h"
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
+#include "Core/EntityWrapper.h"
 
 World::~World()
 {
@@ -44,7 +45,7 @@ bool World::ValidEntity(EntityID entity) const
     return m_EntityParents.find(entity) != m_EntityParents.end();
 }
 
-void World::RegisterComponent(ComponentInfo& ci)
+void World::RegisterComponent(const ComponentInfo& ci)
 {
     if (m_ComponentPools.find(ci.Name) == m_ComponentPools.end()) {
         m_ComponentPools[ci.Name] = new ComponentPool(ci);
@@ -151,6 +152,62 @@ std::string World::GetName(EntityID entity) const
     }
 }
 
+EntityWrapper World::GetFirstEntityByName(const std::string& name)
+{
+    auto itPair = GetDirectChildren(EntityID_Invalid);
+    for (auto it = itPair.first; it != itPair.second; it++) {
+        EntityID childEntityID = it->second;
+        EntityWrapper childEntity(this, childEntityID);
+        if (!childEntity.Valid()) {
+            continue;
+        }
+        EntityWrapper entityWithName = childEntity.Name() == name ? childEntity : childEntity.FirstChildByName(name);
+        if (entityWithName.Valid()) {
+            return entityWithName;
+        }
+    }
+    return EntityWrapper::Invalid;
+}
+
+std::unordered_map<EntityID, EntityID> World::Merge(const World* other)
+{
+    std::unordered_map<EntityID, EntityID> oldToNew;
+
+    // Create new entities
+    for (auto& kv : other->m_EntityParents) {
+        EntityID entity = kv.first;
+
+        EntityID newEntity = CreateEntity();
+        SetName(newEntity, other->GetName(entity));
+        oldToNew[entity] = newEntity;
+    }
+    // Fix relationships
+    for (auto& kv : other->m_EntityParents) {
+        EntityID entity = kv.first;
+        EntityID parent = kv.second;
+        if (parent != EntityID_Invalid) {
+            SetParent(oldToNew.at(entity), oldToNew.at(parent));
+        }
+    }
+
+    // Transfer components
+    for (auto& kv : other->m_ComponentPools) {
+        auto& componentType = kv.first;
+        ComponentPool* pool = kv.second;
+        // Register pool if it's not present in world
+        if (m_ComponentPools.count(componentType) == 0) {
+            RegisterComponent(pool->ComponentInfo());
+        }
+        // Copy components
+        for (auto component : *pool) {
+            ComponentWrapper newComponent = AttachComponent(oldToNew.at(component.EntityID), componentType);
+            component.Copy(newComponent);
+        }
+    }
+
+    return oldToNew;
+}
+
 EntityID World::generateEntityID()
 {
     // TODO: Make EntityID generation smarter

src/Engine/Editor/EditorGUI.cpp

@@ -580,6 +580,11 @@ void EditorGUI::createWidgetToolButton(WidgetMode mode)
 
 bool EditorGUI::OnKeyDown(const Events::KeyDown& e)
 {
+    ImGuiIO& io = ImGui::GetIO();
+    if (io.WantCaptureKeyboard) {
+        return false;
+    }
+
     if (e.ModCtrl && e.KeyCode == GLFW_KEY_S) {
         if (m_CurrentSelection.Valid()) {
             EntityWrapper baseParent = m_CurrentSelection;

src/Engine/Editor/EditorSystem.cpp

@@ -2,6 +2,7 @@
 #include "Core/UniformScaleSystem.h"
 #include "Editor/EditorRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
+#include "Core/EntityFile.h"
 
 EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
     : System(params)
@@ -129,7 +130,7 @@ void EditorSystem::OnEntitySelected(EntityWrapper entity)
 
 void EditorSystem::OnEntitySave(EntityWrapper entity, boost::filesystem::path filePath)
 {
-    EntityFileWriter writer(filePath);
+    EntityXMLFileWriter writer(filePath);
     writer.WriteEntity(entity.World, entity.ID);
 }
 
@@ -260,12 +261,11 @@ EntityWrapper EditorSystem::importEntity(EntityWrapper parent, boost::filesystem
 
     try {
         auto entityFile = ResourceManager::Load<EntityFile>(filePath.string());
-        EntityFilePreprocessor fpp(entityFile);
-        fpp.RegisterComponents(parent.World);
-        EntityFileParser fp(entityFile);
-        EntityID newEntity = fp.MergeEntities(parent.World, parent.ID);
-        return EntityWrapper(parent.World, newEntity);
-    } catch (const std::exception&) {
+        EntityWrapper newEntity = entityFile->MergeInto(parent.World);
+        parent.World->SetParent(newEntity.ID, parent.ID);
+        return newEntity;
+    } catch (const std::exception& e) {
+        LOG_ERROR("Failed to import entity \"%s\": \"%s\"", filePath.string().c_str(), e.what());
         return EntityWrapper::Invalid;
     }
 }

src/Engine/Network/Client.cpp

@@ -33,6 +33,7 @@ void Client::Connect(std::string address, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &Client::OnDoubleJump);
+    EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &Client::OnDashAbility);
     EVENT_SUBSCRIBE_MEMBER(m_ESearchForServers, &Client::OnSearchForServers);
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_Address = address;
@@ -101,8 +102,7 @@ void Client::Update()
 
 void Client::parseMessageType(Packet& packet)
 {
-    // Pop packetSize which is used by TCP Client to
-    // create a packet of the correct size
+    // Pop packetSize
     packet.ReadPrimitive<int>();
     int messageType = packet.ReadPrimitive<int>();
     if (messageType == -1)
@@ -144,6 +144,12 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::OnDoubleJump:
         parseDoubleJump(packet);
         break;
+    case MessageType::OnDashEffect:
+        parseDashEffect(packet);
+        break;
+    case MessageType::AmmoPickup:
+        parseAmmoPickup(packet);
+        break;
     default:
         break;
     }
@@ -233,7 +239,6 @@ void Client::parseSpawnEvents()
         m_EventBroker->Publish(e);
     }
     m_PlayerSpawnEvents = tempSpawn;
-    // m_PlayerSpawnEvents.clear();
 }
 
 void Client::parsePlayersSpawned(Packet& packet)
@@ -261,7 +266,7 @@ void Client::parseEntityDeletion(Packet & packet)
     if (m_ServerIDToClientID.find(entityToDelete) != m_ServerIDToClientID.end()) {
         EntityID localEntity = m_ServerIDToClientID.at(entityToDelete);
         if (m_World->ValidEntity(localEntity)) {
-            if (m_World->HasComponent(localEntity,"Player")) {
+            if (m_World->HasComponent(localEntity, "Player")) {
                 Events::PlayerDeath e;
                 e.Player = EntityWrapper(m_World, localEntity);
                 m_EventBroker->Publish(e);
@@ -296,6 +301,28 @@ void Client::parseDoubleJump(Packet & packet)
     }
 }
 
+
+void Client::parseDashEffect(Packet& packet)
+{
+    EntityID serverID = packet.ReadPrimitive<EntityID>();
+    if (!serverClientMapsHasEntity(serverID)) {
+        return;
+    }
+    Events::DashAbility e;
+    e.Player = m_ServerIDToClientID.at(serverID);
+    if (e.Player != m_LocalPlayer.ID) {
+        m_EventBroker->Publish(e);
+    }
+}
+
+void Client::parseAmmoPickup(Packet & packet)
+{
+    Events::AmmoPickup e;
+    e.AmmoGain = packet.ReadPrimitive<int>();
+    e.Player = m_LocalPlayer;
+    m_EventBroker->Publish(e);
+}
+
 void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
 {
     for (auto field : componentInfo.FieldsInOrder) {
@@ -379,7 +406,7 @@ void Client::parseSnapshot(Packet& packet)
                     if (m_SnapshotFilter != nullptr) {
                         shouldApply = m_SnapshotFilter->FilterComponent(localEntity, newComponent);
                     }
-                    if (shouldApply) {                        
+                    if (shouldApply) {
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
@@ -509,6 +536,18 @@ bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
     return true;
 }
 
+
+bool Client::OnDashAbility(const Events::DashAbility& e)
+{
+    if (!clientServerMapsHasEntity(e.Player) || e.Player != m_LocalPlayer.ID) {
+        return false;
+    }
+    Packet packet(MessageType::OnDashEffect);
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.Player));
+    m_Reliable.Send(packet);
+    return true;
+}
+
 bool Client::OnSearchForServers(const Events::SearchForServers& e)
 {
     m_SearchingForServers = true;

src/Engine/Network/Server.cpp

@@ -13,7 +13,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &Server::OnEntityDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
-
+    EVENT_SUBSCRIBE_MEMBER(m_EAmmoPickup, &Server::OnAmmoPickup);
     // BindWW
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
@@ -141,6 +141,9 @@ void Server::parseMessageType(Packet& packet)
     case MessageType::OnDoubleJump:
         parseDoubleJump(packet);
         break;
+    case MessageType::OnDashEffect:
+        parseDashEffect(packet);
+        break;
     default:
         break;
     }
@@ -510,6 +513,19 @@ bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
     return true;
 }
 
+bool Server::OnAmmoPickup(const Events::AmmoPickup & e)
+{
+    for (auto& kv : m_ConnectedPlayers) {
+        if (e.Player.ID == kv.second.EntityID) {
+            Packet packet(MessageType::AmmoPickup);
+            // We dont send playerID as it will be set at client to local 
+            packet.WritePrimitive(e.AmmoGain);
+            m_Reliable.Send(packet, kv.second);
+        }
+    }
+    return true;
+}
+
 void Server::parseClientPing()
 {
     LOG_INFO("%i: Parsing ping", m_PacketID);
@@ -542,6 +558,11 @@ bool Server::parseDoubleJump(Packet & packet)
     return true;
 }
 
+void Server::parseDashEffect(Packet& packet)
+{
+    reliableBroadcast(packet);
+}
+
 void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
@@ -604,12 +625,14 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
     auto children = m_World->GetDirectChildren(childEntity.ID);
     for (auto it = children.first; it != children.second; it++) {
         EntityWrapper child(m_World, it->second);
-        if(child.HasComponent("CapturePoint")) {
+        if (child.HasComponent("CapturePoint") || child.HasComponent("HealthPickup")
+            || child.HasComponent("AmmoPickup")) {
             return true;
         }
     }
     return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint");
+        || childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("HealthPickup")
+        || childEntity.HasComponent("AmmoPickup");
 }
 
 PlayerID Server::GetPlayerIDFromEndpoint()

src/Engine/Rendering/FrameBuffer.cpp

@@ -70,7 +70,7 @@ void FrameBuffer::Generate()
 	}
 	GLERROR("3");
 
-    GLenum* bufferTextures = &attachments[0];
+    GLenum* bufferTextures = attachments.data();
     glDrawBuffers(attachments.size(), bufferTextures);
     if (GLERROR("GLBufferAttachement error")) {
         printf(": AttachmentSize %i", attachments.size());

src/Game/Game.cpp

@@ -10,7 +10,9 @@
 #include "Systems/SpawnerSystem.h"
 #include "Systems/PlayerSpawnSystem.h"
 #include "Systems/PlayerDeathSystem.h"
-#include "Core/EntityFileWriter.h"
+#include "Systems/FloatingEffectSystem.h"
+#include "Core/EntityFile.h"
+#include "Core/EntityXMLFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 #include "Game/Systems/CapturePointHUDSystem.h"
 #include "Game/Systems/PickupSpawnSystem.h"
@@ -25,7 +27,11 @@
 #include "Rendering/AnimationSystem.h"
 #include "Network/MultiplayerSnapshotFilter.h"
 #include "Game/Systems/AmmunitionHUDSystem.h"
+#include "Game/Systems/AbilityCooldownHUDSystem.h"
+#include "Game/Systems/CapturePointArrowHUDSystem.h"
 #include "Game/Systems/KillFeedSystem.h"
+#include "Game/Systems/BoostSystem.h"
+#include "Game/Systems/BoostIconsHUDSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"
 
@@ -42,6 +48,7 @@ Game::Game(int argc, char* argv[])
     ResourceManager::RegisterType<PNG>("Png");
     ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
     ResourceManager::RegisterType<EntityFile>("EntityFile");
+    ResourceManager::RegisterType<EntityXMLFile>("EntityXMLFile");
     ResourceManager::RegisterType<Font>("FontFile");
 
     m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
@@ -78,10 +85,7 @@ Game::Game(int argc, char* argv[])
     std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
     if (!mapToLoad.empty()) {
         auto file = ResourceManager::Load<EntityFile>(mapToLoad);
-        EntityFilePreprocessor fpp(file);
-        fpp.RegisterComponents(m_World);
-        EntityFileParser fp(file);
-        fp.MergeEntities(m_World);
+        file->MergeInto(m_World);
     }
 
     // Create the sound manager
@@ -118,6 +122,7 @@ Game::Game(int argc, char* argv[])
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<SoundSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<RaptorCopterSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<FloatingEffectSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ExplosionEffectSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<HealthSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PlayerMovementSystem>(updateOrderLevel);
@@ -131,9 +136,21 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
+    m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");

src/Game/Systems/AbilityCooldownHUDSystem.cpp

@@ -0,0 +1,30 @@
+#include "Game/Systems/AbilityCooldownHUDSystem.h"
+
+void AbilityCooldownHUDSystem::Update(double dt)
+{
+    //HUD element for tracking cooldown on the parent entity with Dashability TODO: Make sure it support other abilities when they are made.
+
+    auto abilityHUDs = m_World->GetComponents("AbilityCooldownHUD");
+    if (abilityHUDs == nullptr)
+        return;
+
+    for (auto& abilityHUDC : *abilityHUDs) {
+        EntityWrapper entity = EntityWrapper(m_World, abilityHUDC.EntityID);
+        EntityWrapper abilityEntity = entity.FirstParentWithComponent("DashAbility");
+        if (!abilityEntity.Valid())
+            return;
+        EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+        if(cooldownTextEntity.Valid()) {
+            if(cooldownTextEntity.HasComponent("Text"))
+            {
+                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
+                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
+                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+                std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
+                if(entity.HasComponent("Fill")) {
+                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
+                }
+            }
+        }
+    }
+}

src/Game/Systems/AmmoPickupSystem.cpp

@@ -3,45 +3,63 @@
 AmmoPickupSystem::AmmoPickupSystem(SystemParams params)
     : System(params)
 {
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &AmmoPickupSystem::OnTriggerTouch);
+    if (IsServer) {
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &AmmoPickupSystem::OnTriggerTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &AmmoPickupSystem::OnTriggerLeave);
+    }
+    if (IsClient) {
+        EVENT_SUBSCRIBE_MEMBER(m_EAmmoPickup, &AmmoPickupSystem::OnAmmoPickup);
+    }
 }
 
 void AmmoPickupSystem::Update(double dt)
 {
-    for (auto it = m_ETriggerTouchVector.begin(); it != m_ETriggerTouchVector.end(); ++it)
-    {
-        auto& ammoPickupPosition = *it;
-        //set the double timer value (value 3)
-        ammoPickupPosition.DecreaseThisRespawnTimer -= dt;
-        if (ammoPickupPosition.DecreaseThisRespawnTimer < 0.0) {
-            //spawn and delete the vector item
-            auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/AmmoPickup.xml");
-            EntityFileParser parser(entityFile);
-            EntityID ammoPickupID = parser.MergeEntities(m_World);
+    if (IsServer) {
+        auto it = m_ETriggerTouchVector.begin();
+        while (it != m_ETriggerTouchVector.end()) {
+            auto& somePickup = *it;
+            somePickup.DecreaseThisRespawnTimer -= dt;
+            if (somePickup.DecreaseThisRespawnTimer < 0.0) {
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/AmmoPickup.xml");
+                EntityWrapper ammoPickup = entityFile->MergeInto(m_World);
 
-            //let the world know a pickup has spawned (graphics effects, etc)
-            Events::PickupSpawned ePickupSpawned;
-            ePickupSpawned.Pickup = EntityWrapper(m_World, ammoPickupID);
-            m_EventBroker->Publish(ePickupSpawned);
+                //let the world know a pickup has spawned
+                Events::PickupSpawned ePickupSpawned;
+                ePickupSpawned.Pickup = ammoPickup;
+                m_EventBroker->Publish(ePickupSpawned);
 
-            //set values from the old entity to the new entity
-            auto& newAmmoPickupEntity = EntityWrapper(m_World, ammoPickupID);
-            newAmmoPickupEntity["Transform"]["Position"] = ammoPickupPosition.Pos;
-            newAmmoPickupEntity["AmmoPickup"]["AmmoGain"] = ammoPickupPosition.AmmoGain;
-            newAmmoPickupEntity["AmmoPickup"]["RespawnTimer"] = ammoPickupPosition.RespawnTimer;
-            m_World->SetParent(newAmmoPickupEntity.ID, ammoPickupPosition.parentID);
+                //copy values from the old entity to the new entity
+                auto& newAmmoPickupEntity = ammoPickup;
+                newAmmoPickupEntity["Transform"]["Position"] = somePickup.Pos;
+                newAmmoPickupEntity["AmmoPickup"]["AmmoGain"] = somePickup.AmmoGain;
+                newAmmoPickupEntity["AmmoPickup"]["RespawnTimer"] = somePickup.RespawnTimer;
+                m_World->SetParent(newAmmoPickupEntity.ID, somePickup.parentID);
 
-            //erase the current element (AmmoPickupPosition)
-            m_ETriggerTouchVector.erase(it);
-            break;
+                //erase the current element (somePickup)
+                it = m_ETriggerTouchVector.erase(it);
+            }
+            else { 
+                it++;
+            }
+        }
+        //still touching m_PickupAtMaximum?
+        for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+            if (!it->player.Valid()) {
+                m_PickupAtMaximum.erase(it);
+                break;
+            }
+            if ((int)it->player["AssaultWeapon"]["Ammo"] < (int)it->player["AssaultWeapon"]["MaxAmmo"]) {
+                DoPickup(it->player, it->trigger);
+                m_PickupAtMaximum.erase(it);
+                break;
+            }
         }
     }
 }
 
-
 bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
-    if (e.Entity != LocalPlayer) {
+    if (!e.Entity.Valid()) {
         return false;
     }
     //TODO: add other weapontypes
@@ -51,29 +69,68 @@ bool AmmoPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
     if (!e.Trigger.HasComponent("AmmoPickup")) {
         return false;
     }
-    int maxWeaponAmmo = (int)e.Entity["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)e.Entity["AssaultWeapon"]["Ammo"];
 
-    int ammoGiven = 0.01*(double)e.Trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
+    //if at maxammo, save the trigger-touch to a vector since standing inside it will not re-trigger the trigger
+    if ((int)e.Entity["AssaultWeapon"]["Ammo"] >= (int)e.Entity["AssaultWeapon"]["MaxAmmo"]) {
+        m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
+        return false;
+    }
+    DoPickup(e.Entity, e.Trigger);
+    return true;
+}
+
+bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
+{
+    if (!e.Player.Valid()) {
+        return false;
+    }
+    //TODO: add other weapontypes
+    if (!e.Player.HasComponent("AssaultWeapon")) {
+        return false;
+    }
+    int maxWeaponAmmo = (int)e.Player["AssaultWeapon"]["MaxAmmo"];
+    int& currentAmmo = (int)e.Player["AssaultWeapon"]["Ammo"];
     //cant pick up ammopacks if you are already at MaxAmmo
     if (currentAmmo >= maxWeaponAmmo) {
         return false;
     }
 
-    //personEntered = e.Entity, thingEntered = e.Trigger
+    currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
+    return false;
+}
+
+bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
+    if (!e.Trigger.HasComponent("AmmoPickup")) {
+        return false;
+    }
+    //triggerleave erases possible m_PickupAtMaximum
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (it->trigger.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
+            m_PickupAtMaximum.erase(it);
+            break;
+        }
+    }
+    return true;
+}
+
+void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+    int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
+    int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
+    int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
+
     Events::AmmoPickup ePlayerAmmoPickup;
     ePlayerAmmoPickup.AmmoGain = ammoGiven;
-    ePlayerAmmoPickup.Player = e.Entity;
+    ePlayerAmmoPickup.Player = player;
     m_EventBroker->Publish(ePlayerAmmoPickup);
-    //immediately give the player the ammo
+
+    //immediately give the player the ammo (on server)
     currentAmmo = std::min(currentAmmo + ammoGiven, maxWeaponAmmo);
 
     //copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each ammoPickup
-    m_ETriggerTouchVector.push_back({ e.Trigger["Transform"]["Position"], e.Trigger["AmmoPickup"]["AmmoGain"],
-        e.Trigger["AmmoPickup"]["RespawnTimer"], e.Trigger["AmmoPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+    m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],
+        trigger["AmmoPickup"]["RespawnTimer"], trigger["AmmoPickup"]["RespawnTimer"], m_World->GetParent(trigger.ID) });
 
     //delete the ammopickup
-    m_World->DeleteEntity(e.Trigger.ID);
-    return true;
+    m_World->DeleteEntity(trigger.ID);
 }

src/Game/Systems/BoostIconsHUDSystem.cpp

@@ -0,0 +1,42 @@
+#include "Game/Systems/BoostIconsHUDSystem.h"
+
+void BoostIconsHUDSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
+{
+    EntityWrapper assaultEntity = entity.FirstChildByName("Assault");
+    EntityWrapper defenderEntity = entity.FirstChildByName("Defender");
+    EntityWrapper sniperEntity = entity.FirstChildByName("Sniper");
+
+    if(assaultEntity.Valid()) {
+        if (assaultEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = assaultEntity.FirstParentWithComponent("BoostAssault");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)assaultEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)assaultEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+
+    if (defenderEntity.Valid()) {
+        if (defenderEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = defenderEntity.FirstParentWithComponent("BoostDefender");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)defenderEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)defenderEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+
+    if (sniperEntity.Valid()) {
+        if (sniperEntity.HasComponent("Fill")) {
+            EntityWrapper parentWithAssaultBoost = sniperEntity.FirstParentWithComponent("BoostSniper");
+            if (parentWithAssaultBoost.Valid()) {
+                (double&)sniperEntity["Fill"]["Percentage"] = 1.0;
+            } else {
+                (double&)sniperEntity["Fill"]["Percentage"] = 0.0;
+            }
+        }
+    }
+}
+

src/Game/Systems/BoostSystem.cpp

@@ -0,0 +1,62 @@
+#include "Systems/BoostSystem.h"
+
+BoostSystem::BoostSystem(SystemParams params)
+    : System(params)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &BoostSystem::OnPlayerDamage);
+}
+
+bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
+{
+    if (e.Victim.ID == e.Inflictor.ID) {
+        return false;
+    }
+    if (!e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+        return false;
+    }
+    if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
+        return false;
+    }
+
+    //if its not friendly fire, return
+    if ((int)m_World->GetComponent(e.Inflictor.ID, "Team")["Team"] != (int)m_World->GetComponent(e.Victim.ID, "Team")["Team"]) {
+        return false;
+    }
+
+    //determine the inflictors class
+    auto className = DetermineClass(e.Inflictor);
+    if (className == "") {
+        return false;
+    }
+
+    //get the XML file, example: "Schema/Entities/BoostclassName.xml"
+    std::string classXML = "Schema/Entities/" + className + ".xml";
+
+    //check if player already has a child with the component, if so delete that child
+    auto playerBoostAssaultEntity = e.Victim.FirstChildByName(className);
+    if (playerBoostAssaultEntity.Valid()) {
+        m_World->DeleteEntity(playerBoostAssaultEntity.ID);
+    }
+    //load boost XML file, set it entity parented with the victim player
+    auto entityFile = ResourceManager::Load<EntityFile>(classXML);
+    EntityWrapper boostAssaultEntity = entityFile->MergeInto(m_World);
+    m_World->SetName(boostAssaultEntity.ID, className);
+    m_World->SetParent(boostAssaultEntity.ID, e.Victim.ID);
+
+    return true;
+}
+
+std::string BoostSystem::DetermineClass(EntityWrapper inflictorPlayer)
+{
+    //determine the class based on what component the inflictor-player has
+    if (m_World->HasComponent(inflictorPlayer.ID, "DashAbility")) {
+        return "BoostAssault";
+    }
+    if (m_World->HasComponent(inflictorPlayer.ID, "ShieldAbility")) {
+        return "BoostDefender";
+    }
+    if (m_World->HasComponent(inflictorPlayer.ID, "SprintAbility")) {
+        return "BoostSniper";
+    }
+    return "";
+}

src/Game/Systems/CapturePointArrowHUDSystem.cpp

@@ -0,0 +1,183 @@
+#include "Systems/CapturePointArrowHUDSystem.h"
+
+CapturePointArrowHUDSystem::CapturePointArrowHUDSystem(SystemParams params)
+    : System(params)
+    , ImpureSystem()
+{
+    EVENT_SUBSCRIBE_MEMBER(m_ECapturedEvent, &CapturePointArrowHUDSystem::OnCapturePointCaptured);
+}
+
+
+void CapturePointArrowHUDSystem::Update(double dt)
+{
+    bool loadCheck = true;
+    int redTeamEnum;
+    int blueTeamEnum;
+    int spectatorTeamEnum;
+
+    //Get list for all CapturePointArrowHUDComponents
+    auto arrowHUDs = m_World->GetComponents("CapturePointArrowHUD");
+    auto capturePoints = m_World->GetComponents("CapturePoint");
+    if(arrowHUDs == nullptr) {
+        return;
+    }
+
+    for(auto& cArrowHUD : *arrowHUDs) {
+        //Get what team the current arrow corresponds to
+        EntityWrapper arrowEntity = EntityWrapper(m_World, cArrowHUD.EntityID);
+        if (!arrowEntity.Valid()) {
+            continue;
+        }
+        if(!arrowEntity.HasComponent("Team")) {
+            continue;
+        }
+        auto cTeam = arrowEntity["Team"];
+        int currentTeam = (int)cTeam["Team"];
+
+        if (loadCheck) {
+            redTeamEnum = (int)cTeam["Team"].Enum("Red");
+            blueTeamEnum = (int)cTeam["Team"].Enum("Blue");
+            spectatorTeamEnum = (int)cTeam["Team"].Enum("Spectator");
+            loadCheck = false;
+
+
+            if (!m_InitialtargetsSet) {
+                std::unordered_map<int, glm::vec3> blueTargets, redTargets;
+                EntityWrapper homeBlue, homeRed;
+                int lastCP = -INFINITY;
+                int firstCP = INFINITY;
+
+                for (auto& cCP : *capturePoints) {
+                    auto homePointTeam = (int)cCP["HomePointForTeam"];
+                    EntityWrapper capturePointEntity = EntityWrapper(m_World, cCP.EntityID);
+                    int capturePointID = (int)capturePointEntity["CapturePoint"]["CapturePointNumber"];
+
+                    if(capturePointID < firstCP) {
+                        firstCP = capturePointID;
+                    }
+
+                    if(capturePointID > lastCP) {
+                        lastCP = capturePointID;
+                    }
+
+                    if (!capturePointEntity.HasComponent("Team")) {
+                        continue;
+                    }
+
+                    int currentOwner = (int)capturePointEntity["Team"]["Team"];
+
+                    if(currentOwner != redTeamEnum) {
+                        //This capturePoint is not owned by the red team and is therefor an eligible target for red team
+                        glm::vec3 targetPos = Transform::AbsolutePosition(capturePointEntity);
+                        redTargets.insert(std::pair<int, glm::vec3>(capturePointID, targetPos));
+                    }
+                    if(currentOwner != blueTeamEnum) {
+                        //This capturePoint is not owned by the blue team and is therefor an eligible target for blue team
+                        glm::vec3 targetPos = Transform::AbsolutePosition(capturePointEntity);
+                        blueTargets.insert(std::pair<int, glm::vec3>(capturePointID, targetPos));
+                    }
+
+                    if(homePointTeam == blueTeamEnum) {
+                        //CP is the home point for blue team.
+                        homeBlue = capturePointEntity;
+                    } else if (homePointTeam == redTeamEnum) {
+                        //CP is the home point for red team.
+                        homeRed = capturePointEntity;
+                    }
+                }
+
+                if(!homeRed.Valid() || !homeBlue.Valid()) {
+                    //One or both teams have no home point, cant continue
+                    return;
+                }
+
+                std::unordered_map<int, glm::vec3>::const_iterator got;
+                //Find next target for red team.
+                if((int)homeRed["CapturePoint"]["CapturePointNumber"] == lastCP) {
+                    //Red home base is the last capture point, count back from lastCP and find next target
+                    for (int i = lastCP; i >= firstCP; i--) {
+                        got = redTargets.find(i);
+                        if(got == redTargets.end()) {
+                            continue;
+                        } else {
+                            m_RedTeamCurrentTarget = got->second;
+                            break;
+                        }
+                    }
+                } else if ((int)homeRed["CapturePoint"]["CapturePointNumber"] == firstCP) {
+                    //Red home is the first capture point, count forward from firstCP and find next target.
+                    for (int i = firstCP; i <= lastCP; i++) {
+                        got = redTargets.find(i);
+                        if(got == redTargets.end()) {
+                            //Target was not found, try the next one after that.
+                            continue;
+                        } else {
+                            m_RedTeamCurrentTarget = got->second;
+                            break;
+                        }
+                    }
+                }
+
+                //Find next target for blue team
+                if ((int)homeBlue["CapturePoint"]["CapturePointNumber"] == lastCP) {
+                    //Red home base is the last capture point, count back from lastCP and find next target
+                    for (int i = lastCP; i >= firstCP; i--) {
+                        got = blueTargets.find(i);
+                        if (got == blueTargets.end()) {
+                            continue;
+                        } else {
+                            m_BlueTeamCurrentTarget = got->second;
+                            break;
+                        }
+                    }
+                } else if ((int)homeBlue["CapturePoint"]["CapturePointNumber"] == firstCP) {
+                    //Red home is the first capture point, count forward from firstCP and find next target.
+                    for (int i = firstCP; i <= lastCP; i++) {
+                        got = blueTargets.find(i);
+                        if (got == blueTargets.end()) {
+                            //Target was not found, try the next one after that.
+                            continue;
+                        } else {
+                            m_BlueTeamCurrentTarget = got->second;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        //if red team, get red team next point, otherwise blue team next point.
+        //Untill this is awailable we will just use the hardcoded value in the component.
+        //This will also give us a position, so we wont need to loop through all capturePoints.
+        glm::vec3 pos;
+        if(currentTeam == redTeamEnum) {
+            pos = m_RedTeamCurrentTarget;
+        } else if (currentTeam == blueTeamEnum) {
+            pos = m_BlueTeamCurrentTarget;
+        }
+
+        glm::vec3& arrowOri = arrowEntity["Transform"]["Orientation"];
+        glm::vec3 lookVector = glm::normalize(Transform::AbsolutePosition(arrowEntity) - pos); //Maybe should be player instead
+        float pitch = std::asin(-lookVector.y);
+        float yaw = std::atan2(lookVector.x, lookVector.z);
+        arrowOri.x = pitch;
+        arrowOri.y = yaw;
+        arrowOri.z = 0.f;
+        EntityWrapper parent = arrowEntity.Parent();
+        if (parent.Valid()) {
+            arrowOri -= Transform::AbsoluteOrientationEuler(parent);
+        }
+    }
+}
+
+bool CapturePointArrowHUDSystem::OnCapturePointCaptured(Events::Captured& e)
+{
+    if(!e.BlueTeamNextCapturePoint.Valid() || !e.RedTeamNextCapturePoint.Valid()) {
+        return 0;
+    }
+
+    m_RedTeamCurrentTarget = Transform::AbsolutePosition(e.RedTeamNextCapturePoint);
+    m_BlueTeamCurrentTarget = Transform::AbsolutePosition(e.BlueTeamNextCapturePoint);
+
+    m_InitialtargetsSet = true;
+    return 0;
+}

src/Game/Systems/CapturePointSystem.cpp

@@ -6,7 +6,7 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
-    if (!IsClient) {
+    if (IsServer) {
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
         EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
@@ -18,7 +18,7 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
 void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
-    if (IsClient) {
+    if (!IsServer) {
         return;
     }
     if (m_WinnerWasFound) {
@@ -102,6 +102,12 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             nextPossibleCapturePoint["Blue"] = i - 1;
         }
     }
+    if (m_RecentlyCapturedNeedNextCapturePointNow) {
+        m_CapturedEvent.BlueTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Blue"]];
+        m_CapturedEvent.RedTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Red"]];
+        m_EventBroker->Publish(m_CapturedEvent);
+        m_RecentlyCapturedNeedNextCapturePointNow = false;
+    }
 
     //reset timers and reset the bool that triggers this
     if (m_ResetTimers) {
@@ -188,10 +194,9 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             teamComponent["Team"] = currentTeam;
             cCapturePoint["CaptureTimer"] = glm::sign((double)cCapturePoint["CaptureTimer"])*captureTimeToTakeOver;
             //publish Captured event
-            Events::Captured e;
-            e.CapturePointID = cCapturePoint.EntityID;
-            e.TeamNumberThatCapturedCapturePoint = currentTeam;
-            m_EventBroker->Publish(e);
+            m_RecentlyCapturedNeedNextCapturePointNow = true;
+            m_CapturedEvent.CapturePointTakenID = cCapturePoint.EntityID;
+            m_CapturedEvent.TeamNumberThatCapturedCapturePoint = currentTeam;
             //NextPossibleCapturePoint will be calculated in the next update...
         }
     }

src/Game/Systems/DamageIndicatorSystem.cpp

@@ -9,7 +9,7 @@ DamageIndicatorSystem::DamageIndicatorSystem(SystemParams params)
 
     //load texture to cache
     auto texture = CommonFunctions::LoadTexture("Textures/DamageIndicator.png", false);
-    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DamageIndicator.xml");
+    auto entityFile = ResourceManager::Load<EntityXMLFile>("Schema/Entities/DamageIndicator.xml");
 }
 
 void DamageIndicatorSystem::Update(double dt) {
@@ -50,15 +50,13 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
 
     //load & set the "2d" sprite
     auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DamageIndicator.xml");
-    EntityFileParser parser(entityFile);
-    EntityID spriteID = parser.MergeEntities(m_World);
-    m_World->SetParent(spriteID, m_CurrentCamera);
-    auto spriteWrapper = EntityWrapper(m_World, spriteID);
+    EntityWrapper sprite = entityFile->MergeInto(m_World);
+    m_World->SetParent(sprite.ID, m_CurrentCamera);
     //simply set the rotation z-wise to the angleBetweenVectors
-    spriteWrapper["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
+    sprite["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
 
     if (!IsServer) {
-        updateDamageIndicatorVector.emplace_back(spriteWrapper, inflictorPos);
+        updateDamageIndicatorVector.emplace_back(sprite, inflictorPos);
     }
 
     return true;
@@ -127,8 +125,8 @@ glm::vec3 DamageIndicatorSystem::DamageIndicatorTest(EntityWrapper player) {
      auto inflictorPos = glm::vec3(currentPos.x + testVar*6.0f, currentPos.y, currentPos.z + testVar2*6.0f);
 
     //load the explosioneffect XML
-    auto deathEffect = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
-    EntityFileParser parser(deathEffect);
+    auto deathEffect = ResourceManager::Load<EntityXMLFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
+    EntityXMLFileParser parser(deathEffect);
     EntityID deathEffectID = parser.MergeEntities(m_World);
     EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
 

src/Game/Systems/HealthSystem.cpp

@@ -30,6 +30,11 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 
     ComponentWrapper cHealth = e.Victim["Health"];
     double& health = cHealth["Health"];
+    //if player has the boost from a defender, subtract the damage taken by StrengthOfEffect amount
+    auto playerBoostDefenderEntity = e.Victim.FirstChildByName("BoostDefender");
+    if (playerBoostDefenderEntity.Valid()) {
+        e.Damage -= (double)playerBoostDefenderEntity["BoostDefender"]["StrengthOfEffect"];
+    }
     health -= e.Damage;
 
     return true;

src/Game/Systems/PickupSpawnSystem.cpp

@@ -3,65 +3,99 @@
 PickupSpawnSystem::PickupSpawnSystem(SystemParams params)
     : System(params)
 {
-    EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &PickupSpawnSystem::OnTriggerTouch);
+    if (IsServer) {
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &PickupSpawnSystem::OnTriggerTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &PickupSpawnSystem::OnTriggerLeave);
+    }
 }
 
 void PickupSpawnSystem::Update(double dt)
 {
-    for (auto it = m_ETriggerTouchVector.begin(); it != m_ETriggerTouchVector.end(); ++it)
-    {
-        auto& healthPickupPosition = *it;
-        //set the double timer value (value 3)
-        healthPickupPosition.DecreaseThisRespawnTimer -= dt;
-        if (healthPickupPosition.DecreaseThisRespawnTimer < 0) {
-            //spawn and delete the vector item
-            auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");
-            EntityFileParser parser(entityFile);
-            EntityID healthPickupID = parser.MergeEntities(m_World);
+    if (IsServer) {
+        auto it = m_ETriggerTouchVector.begin();
+        while (it != m_ETriggerTouchVector.end()) {
+            auto& somePickup = *it;
+            somePickup.DecreaseThisRespawnTimer -= dt;
+            if (somePickup.DecreaseThisRespawnTimer < 0.0) {
+                //spawn the new healthPickup
+                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/HealthPickup.xml");
+                EntityWrapper healthPickup = entityFile->MergeInto(m_World);
 
-            //let the world know a pickup has spawned (graphics effects, etc)
-            Events::PickupSpawned ePickupSpawned;
-            ePickupSpawned.Pickup = EntityWrapper(m_World, healthPickupID);
-            m_EventBroker->Publish(ePickupSpawned);
+                //let the world know a pickup has spawned (graphics effects, etc)
+                Events::PickupSpawned ePickupSpawned;
+                ePickupSpawned.Pickup = healthPickup;
+                m_EventBroker->Publish(ePickupSpawned);
 
-            //set values from the old entity to the new entity
-            auto& newHealthPickupEntity = EntityWrapper(m_World, healthPickupID);
-            newHealthPickupEntity["Transform"]["Position"] = healthPickupPosition.Pos;
-            newHealthPickupEntity["HealthPickup"]["HealthGain"] = healthPickupPosition.HealthGain;
-            newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = healthPickupPosition.RespawnTimer;
-            m_World->SetParent(newHealthPickupEntity.ID, healthPickupPosition.parentID);
+                //copy values from the old entity to the new entity
+                auto& newHealthPickupEntity = healthPickup;
+                newHealthPickupEntity["Transform"]["Position"] = somePickup.Pos;
+                newHealthPickupEntity["HealthPickup"]["HealthGain"] = somePickup.HealthGain;
+                newHealthPickupEntity["HealthPickup"]["RespawnTimer"] = somePickup.RespawnTimer;
+                m_World->SetParent(newHealthPickupEntity.ID, somePickup.parentID);
 
-            //erase the current element (healthPickupPosition)
-            m_ETriggerTouchVector.erase(it);
-            break;
+                //erase the current element (somePickup)
+                it = m_ETriggerTouchVector.erase(it);
+            } else {
+                it++;
+            }
+        }
+        //still touching PickupAtMaximum?
+        for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+            if (!it->player.Valid()) {
+                m_PickupAtMaximum.erase(it);
+                break;
+            }
+            if ((double)it->player["Health"]["Health"] < (double)it->player["Health"]["MaxHealth"]) {
+                DoPickup(it->player, it->trigger);
+                m_PickupAtMaximum.erase(it);
+                break;
+            }
         }
     }
 }
-
-
 bool PickupSpawnSystem::OnTriggerTouch(Events::TriggerTouch& e)
 {
     if (!e.Trigger.HasComponent("HealthPickup")) {
         return false;
     }
-    double healthGiven = 0.01*(double)e.Trigger["HealthPickup"]["HealthGain"] * (double)e.Entity["Health"]["MaxHealth"];
-    //cant pick up healthpacks if you are already at MaxHealth
+    //if at maxhealth, save the trigger-touch to a vector since standing inside it will not re-trigger the trigger
     if ((double)e.Entity["Health"]["Health"] >= (double)e.Entity["Health"]["MaxHealth"]) {
+        m_PickupAtMaximum.push_back({ e.Entity, e.Trigger });
         return false;
     }
 
-    //personEntered = e.Entity, thingEntered = e.Trigger
+    DoPickup(e.Entity, e.Trigger);
+    return true;
+}
+bool PickupSpawnSystem::OnTriggerLeave(Events::TriggerLeave& e)
+{
+    if (!e.Trigger.HasComponent("HealthPickup")) {
+        return false;
+    }
+    //triggerleave erases possible m_PickupAtMaximum
+    for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
+        if (it->trigger.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
+            m_PickupAtMaximum.erase(it);
+            break;
+        }
+    }
+    return true;
+}
+void PickupSpawnSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger)
+{
+    double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
+
+    //only the server will increase the players hp and set it in the next delta
     Events::PlayerHealthPickup ePlayerHealthPickup;
     ePlayerHealthPickup.HealthAmount = healthGiven;
-    ePlayerHealthPickup.Player = e.Entity;
+    ePlayerHealthPickup.Player = player;
     m_EventBroker->Publish(ePlayerHealthPickup);
 
     //copy position, healthgain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each healthPickup
-    m_ETriggerTouchVector.push_back({ (glm::vec3)e.Trigger["Transform"]["Position"] ,e.Trigger["HealthPickup"]["HealthGain"],
-        e.Trigger["HealthPickup"]["RespawnTimer"],e.Trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(e.Trigger.ID) });
+    m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"], trigger["HealthPickup"]["HealthGain"],
+        trigger["HealthPickup"]["RespawnTimer"], trigger["HealthPickup"]["RespawnTimer"], m_World->GetParent(trigger.ID) });
 
     //delete the healthpickup
-    m_World->DeleteEntity(e.Trigger.ID);
-    return true;
+    m_World->DeleteEntity(trigger.ID);
 }

src/Game/Systems/PlayerDeathSystem.cpp

@@ -4,6 +4,7 @@ PlayerDeathSystem::PlayerDeathSystem(SystemParams params)
     : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_OnPlayerDeath, &PlayerDeathSystem::OnPlayerDeath);
+    EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &PlayerDeathSystem::OnEntityDeleted);
 }
 
 void PlayerDeathSystem::Update(double dt)
@@ -27,10 +28,8 @@ bool PlayerDeathSystem::OnPlayerDeath(Events::PlayerDeath& e)
 void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
 {
     //load the explosioneffect XML
-    auto deathEffect = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
-    EntityFileParser parser(deathEffect);
-    EntityID deathEffectID = parser.MergeEntities(m_World);
-    EntityWrapper deathEffectEW = EntityWrapper(m_World, deathEffectID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/PlayerDeathExplosionWithCamera.xml");
+    EntityWrapper deathEffectEW = entityFile->MergeInto(m_World);
 
     //components that we need from player
     auto playerModel = player.FirstChildByName("PlayerModel");
@@ -59,9 +58,28 @@ void PlayerDeathSystem::createDeathEffect(EntityWrapper player)
 
     //camera (with lifetime) behind the player
     if (player == LocalPlayer) {
+        m_LocalPlayerDeathEffect = deathEffectEW;
         auto cam = deathEffectEW.FirstChildByName("Camera");
         Events::SetCamera eSetCamera;
         eSetCamera.CameraEntity = cam;
         m_EventBroker->Publish(eSetCamera);
     }
 }
+
+bool PlayerDeathSystem::OnEntityDeleted(Events::EntityDeleted& e)
+{
+    // We only care about when the local players death effect is removed.
+    if (m_LocalPlayerDeathEffect.ID != e.DeletedEntity) {
+        return false;
+    }
+    
+    // Look for the spectator camera entity in the level.
+    EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
+    if (!spectatorCam.Valid() || !spectatorCam.HasComponent("Camera") || LocalPlayer.Valid()) {
+        return false;
+    }
+    Events::SetCamera eSetCamera;
+    eSetCamera.CameraEntity = spectatorCam;
+    m_EventBroker->Publish(eSetCamera);
+    return true;
+}

src/Game/Systems/PlayerMovementSystem.cpp

@@ -5,6 +5,7 @@ PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
+    EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &PlayerMovementSystem::OnDashAbility);
 }
 
 PlayerMovementSystem::~PlayerMovementSystem()
@@ -48,7 +49,7 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
             EntityWrapper playerModel = player.FirstChildByName("PlayerModel");
             if (playerModel.Valid()) {
                 ComponentWrapper cAnimationOffset = playerModel["AnimationOffset"];
-                float pitch = cameraOrientation.x + 0.2;
+                float pitch = cameraOrientation.x + 0.2f;
                 double time = (pitch + glm::half_pi<float>()) / glm::pi<float>();
                 cAnimationOffset["Time"] = time;
             }
@@ -61,12 +62,18 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
         float playerMovementSpeed = player["Player"]["MovementSpeed"];
         float playerCrouchSpeed = player["Player"]["CrouchSpeed"];
         glm::vec3& wishDirection = player["Player"]["CurrentWishDirection"];
+        auto playerBoostAssaultEntity = player.FirstChildByName("BoostAssault");
+        if (playerBoostAssaultEntity.Valid()) {
+            playerMovementSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
+            playerCrouchSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
+        }
+
 
         if (player.HasComponent("Physics")) {
             ComponentWrapper cPhysics = player["Physics"];
             //Assault Dash Check
             if (player.HasComponent("DashAbility")) {
-                controller->AssaultDashCheck(dt, ((glm::vec3)cPhysics["Velocity"]).y != 0.0f, player["DashAbility"]["CoolDownMaxTimer"]);
+                controller->AssaultDashCheck(dt, ((glm::vec3)cPhysics["Velocity"]).y != 0.0f, player["DashAbility"]["CoolDownMaxTimer"], player["DashAbility"]["CoolDownTimer"], player.ID);
             }
             wishDirection = controller->Movement() * glm::inverse(glm::quat(ori));
             //this makes sure you can only dash in the 4 directions: forw,backw,left,right
@@ -112,6 +119,10 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                 //if doubleTapped do Assault Dash - but only boost maximum 50.0f
                 float doubleTapDashBoost = controller->AssaultDashDoubleTapped() ? 40.0f : 1.0f;
                 accelerationSpeed = glm::min(doubleTapDashBoost*glm::min(accelerationSpeed, addSpeed), 50.0f);
+                //if player has Boost from an Assault class, accelerate the player faster
+                if (playerBoostAssaultEntity.Valid()) {
+                    accelerationSpeed *= (double)playerBoostAssaultEntity["BoostAssault"]["StrengthOfEffect"];
+                }
                 velocity += accelerationSpeed * wishDirection;
                 ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
             }
@@ -303,22 +314,45 @@ bool PlayerMovementSystem::OnPlayerSpawned(Events::PlayerSpawned& e)
 bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e)
 {
     // If entity does not exist, exit
-    if (!EntityWrapper(m_World, e.entityID).Valid()) { 
+    if (!EntityWrapper(m_World, e.entityID).Valid()) {
         return false;
     }
     // If entity IsLocalPlayer, exit
-    if (e.entityID == m_LocalPlayer.ID) { 
+    if (e.entityID == m_LocalPlayer.ID) {
         return false;
     }
     spawnHexagon(EntityWrapper(m_World, e.entityID));
+    return true;
 }
 
 void PlayerMovementSystem::spawnHexagon(EntityWrapper target)
-{ 
+{
     //put a hexagon at the entitys... feet?
-    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
-    EntityFileParser parser(hexagonEffect);
-    EntityID hexagonEffectID = parser.MergeEntities(m_World);
-    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+    EntityWrapper hexagonEW = entityFile->MergeInto(m_World);
     hexagonEW["Transform"]["Position"] = (glm::vec3)target["Transform"]["Position"];
-}
+}
+
+bool PlayerMovementSystem::OnDashAbility(Events::DashAbility & e)
+{
+    EntityWrapper player(m_World, e.Player);
+    if (!player.Valid() || !IsClient || player.ID == LocalPlayer.ID) {
+        return false;
+    }
+
+    auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/DashEffect.xml");
+    EntityWrapper dashEffect = entityFile->MergeInto(m_World);
+    auto playerModel = player.FirstChildByName("PlayerModel");
+    auto playerEntityModel = playerModel["Model"];
+    auto playerEntityAnimation = playerModel["Animation"];
+    playerEntityModel.Copy(dashEffect["Model"]);
+    playerEntityAnimation.Copy(dashEffect["Animation"]);
+    dashEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
+    ((glm::vec4&)dashEffect["ExplosionEffect"]["EndColor"]).w = 0.f;
+    dashEffect["Animation"]["Speed1"] = 0.0;
+    dashEffect["Animation"]["Speed2"] = 0.0;
+    dashEffect["Animation"]["Speed3"] = 0.0;
+    dashEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+    dashEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+    return true;
+}

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -10,7 +10,7 @@ PlayerSpawnSystem::PlayerSpawnSystem(SystemParams params)
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_NetworkEnabled = config->Get("Networking.StartNetwork", false);
     m_ForcedRespawnTime = config->Get("Debug.RespawnTime", -1.0f);
-    m_DbgConfigForceRespawn = m_ForcedRespawnTime > 0;
+    m_DbgConfigForceRespawn = m_ForcedRespawnTime > 0 && IsServer;
 }
 
 void PlayerSpawnSystem::Update(double dt)
@@ -26,7 +26,21 @@ void PlayerSpawnSystem::Update(double dt)
         // Increase timer.
         double& timer = (double&)modeComponent["RespawnTime"];
         timer += dt;
-        double maxRespawnTime = m_DbgConfigForceRespawn ? m_ForcedRespawnTime : (double)modeComponent["MaxRespawnTime"];
+        if (m_DbgConfigForceRespawn) {
+            (double&)modeComponent["MaxRespawnTime"] = m_ForcedRespawnTime;
+        }
+        double maxRespawnTime = (double)modeComponent["MaxRespawnTime"];
+        EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
+        if (spectatorCam.Valid()) {
+            EntityWrapper HUD = spectatorCam.FirstChildByName("SpectatorHUD");
+            if (HUD.Valid()) {
+                EntityWrapper respawnTimer = spectatorCam.FirstChildByName("RespawnTimer");
+                if (respawnTimer.Valid()) {
+                    //Update respawn time in the HUD element.
+                    respawnTimer["Text"]["Content"] = std::to_string(1 + (int)(maxRespawnTime - timer));
+                }
+            }
+        }
         if (timer < maxRespawnTime) {
             return;
         }
@@ -54,7 +68,14 @@ void PlayerSpawnSystem::Update(double dt)
 
             // If the spawner has a team affiliation, check it
             if (spawner.HasComponent("Team")) {
-                if ((int)spawner["Team"]["Team"] != req.Team) {
+                auto cSpawnerTeam = spawner["Team"];
+                if ((int)cSpawnerTeam["Team"] != req.Team) {
+                    // Increase num spawned players if someone picks spectator, since it is valid to pick spectator
+                    // but don't spawn anything, goto next spawnrequest.
+                    if (req.Team == (int)cSpawnerTeam["Team"].Enum("Spectator")) {
+                        ++numSpawnedPlayers;
+                        break;
+                    }
                     continue;
                 }
             }
@@ -75,9 +96,9 @@ void PlayerSpawnSystem::Update(double dt)
         }
     }
     if (numSpawnedPlayers != (int)m_SpawnRequests.size()) {
-        LOG_DEBUG("%i players were supposed to be spawned, but %i was spawned.", (int)m_SpawnRequests.size(), numSpawnedPlayers);
+        LOG_DEBUG("%i players were supposed to be spawned or set as spectator, but only %i was handled.", (int)m_SpawnRequests.size(), numSpawnedPlayers);
     } else {
-        LOG_DEBUG("%i players were spawned.", numSpawnedPlayers);
+        LOG_DEBUG("%i players were spawned or set as spectator.", numSpawnedPlayers);
     }
     m_SpawnRequests.clear();
 }
@@ -88,24 +109,29 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
         return false;
     }
 
+    if (e.Value == 0) {
+        return false;
+    }
+
+    // A dead client should be able to swap to the spectator camera.
+    if (IsClient && !LocalPlayer.Valid()) {
+        // Set the spectator camera as active, if it exists.
+        // Find the camera.
+        EntityWrapper spectatorCam = m_World->GetFirstEntityByName("SpectatorCamera");
+        if (spectatorCam.Valid() && spectatorCam.HasComponent("Camera")) {
+            Events::SetCamera eSetCamera;
+            eSetCamera.CameraEntity = spectatorCam;
+            m_EventBroker->Publish(eSetCamera);
+        }
+    }
+
     // Team picks should be processed ONLY server-side!
     // Don't make a spawn request if we're the client.
     if (!IsServer && m_NetworkEnabled) {
         return false;
     }
 
-    if (e.Value == 0) {
-        return false;
-    }
-
-    //TODO: Spectating?
-    //Right now, return if someone picks spectator.
-    //1 signifies spectator here, could not get Playerteam component since it may be invalid or without team comp.
-    if ((ComponentInfo::EnumType)e.Value == 1) {
-        return false;
-    }
-
-    //Check if the player already requested spawn.
+    // Check if the player already requested spawn.
     auto iter = m_SpawnRequests.begin();
     for (; iter != m_SpawnRequests.end(); ++iter) {
         if (iter->PlayerID == e.PlayerID) {
@@ -114,11 +140,11 @@ bool PlayerSpawnSystem::OnInputCommand(Events::InputCommand& e)
     }
 
     if (iter != m_SpawnRequests.end()) {
-        //If player is in queue to spawn, then change their team affiliation in the request.
+        // If player is in queue to spawn, then change their team affiliation in the request.
         iter->Team = (ComponentInfo::EnumType)e.Value;
     } else if (m_PlayerEntities.count(e.PlayerID) == 0 || !m_PlayerEntities[e.PlayerID].Valid()) {
-        //If player is not in queue to spawn, then create a spawn request, 
-        //but only if they are spectating and/or just connected.
+        // If player is not in queue to spawn, then create a spawn request, 
+        // but only if they are spectating and/or just connected.
         SpawnRequest req;
         req.PlayerID = e.PlayerID;
         req.Team = (ComponentInfo::EnumType)e.Value;

src/Game/Systems/SoundSystem.cpp

@@ -94,7 +94,7 @@ bool SoundSystem::OnCaptured(const Events::Captured & e)
     if (!LocalPlayer.Valid()) {
         return false;
     }
-    int homeTeam = (int)m_World->GetComponent(e.CapturePointID, "Team")["Team"];
+    int homeTeam = (int)m_World->GetComponent(e.CapturePointTakenID, "Team")["Team"];
     int team = (int)m_World->GetComponent(LocalPlayer.ID, "Team")["Team"];
     Events::PlaySoundOnEntity ev;
     if (team == homeTeam) {

src/Game/Systems/SpawnerSystem.cpp

@@ -17,15 +17,17 @@ EntityWrapper SpawnerSystem::Spawn(EntityWrapper spawner, EntityWrapper parent /
 
     // Load the entity file and parse it
     const std::string& entityFilePath = spawner["Spawner"]["EntityFile"];
-    auto entityFile = ResourceManager::Load<EntityFile>(entityFilePath);
-    if (entityFile == nullptr) {
+    EntityWrapper spawnedEntity;
+    try {
+        auto entityFile = ResourceManager::Load<EntityFile>(entityFilePath);
+        spawnedEntity = entityFile->MergeInto(world);
+        world->SetParent(spawnedEntity.ID, parent.ID);
+    } catch (const Resource::FailedLoadingException& e) {
         return EntityWrapper::Invalid;
     }
-    EntityFileParser parser(entityFile);
-    EntityWrapper spawnedEntity(world, parser.MergeEntities(world, parent.ID));
 
-    //If the spawned entity is collideable, then we must not spawn it where it collides with something that
-    //has a dontCollideComponent attached.
+    // If the spawned entity is collidable, then we must not spawn it where it collides with something that
+    // has a dontCollideComponent attached.
     bool spawnOnCollidable = dontCollideComponent.empty() || !spawnedEntity.HasComponent("Collidable");
     if (!spawnOnCollidable) {
         boost::optional<EntityAABB> optBox = Collision::EntityAbsoluteAABB(spawnedEntity);

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp_

@@ -366,9 +366,10 @@ bool AssaultWeaponBehaviour::shoot(double damage)
         return false;
     }
 
-    // Check for friendly fire
+
+    // If friendly fire - reduce damage to 0 (needed to make Boosts, Ammosharing work)
     if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)m_Player["Team"]["Team"]) {
-        return false;
+        damage = 0;
     }
 
     // Deal damage! 

src/Tests/CapturePointTest.cpp

@@ -7,7 +7,7 @@ using boost::unit_test_framework::test_case;
 
 #include "Collision/TriggerSystem.h"
 #include "Collision/CollisionSystem.h"
-#include "Core/EntityFileWriter.h"
+#include "Core/EntityXMLFileWriter.h"
 #include "Game/Systems/CapturePointSystem.h"
 
 BOOST_AUTO_TEST_SUITE(CapturePointTestSuite)
@@ -82,7 +82,7 @@ bool CapturePointTest::CapturePoint_Game_Loop_OneHundredTimes() {
 CapturePointTest::CapturePointTest(int runTestNumber)
 {
     ResourceManager::RegisterType<ConfigFile>("ConfigFile");
-    ResourceManager::RegisterType<EntityFile>("EntityFile");
+    ResourceManager::RegisterType<EntityXMLFile>("EntityFile");
 
     m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
     LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));
@@ -99,10 +99,10 @@ CapturePointTest::CapturePointTest(int runTestNumber)
     m_SystemPipeline->AddSystem<CapturePointSystem>(1);
 
     //must register components (Components.xsd), else you cant create entities. Easiest done by loading a test xsd file
-    auto file = ResourceManager::Load<EntityFile>("Schema/Entities/TeamTest.xml");
-    EntityFilePreprocessor fpp(file);
+    auto file = ResourceManager::Load<EntityXMLFile>("Schema/Entities/TeamTest.xml");
+    EntityXMLFilePreprocessor fpp(file);
     fpp.RegisterComponents(m_World);
-    EntityFileParser fp(file);
+    EntityXMLFileParser fp(file);
     fp.MergeEntities(m_World);
 
     EntityID playerID = m_World->CreateEntity();

src/Tests/CapturePointTest.h

@@ -9,12 +9,12 @@
 #include "Input/KeyboardInputHandler.h"
 #include "Input/MouseInputHandler.h"
 #include "Core/EKeyDown.h"
-#include "Core/EntityFile.h"
+#include "Core/EntityXMLFile.h"
 #include "Core/SystemPipeline.h"
 
-#include "Core/EntityFilePreprocessor.h"
-#include "Core/EntityFileParser.h"
-#include "Core/EntityFileWriter.h"
+#include "Core/EntityXMLFilePreprocessor.h"
+#include "Core/EntityXMLFileParser.h"
+#include "Core/EntityXMLFileWriter.h"
 
 #include "Engine/Collision/ETrigger.h"
 

src/Tests/HealthSystemTest.cpp

@@ -30,7 +30,7 @@ BOOST_AUTO_TEST_SUITE_END()
 GameHealthSystemTest::GameHealthSystemTest()
 {
     ResourceManager::RegisterType<ConfigFile>("ConfigFile");
-    ResourceManager::RegisterType<EntityFile>("EntityFile");
+    ResourceManager::RegisterType<EntityXMLFile>("EntityFile");
 
     m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
     LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get<int>("Debug.LogLevel", 1));
@@ -41,10 +41,10 @@ GameHealthSystemTest::GameHealthSystemTest()
     // Create a world
     m_World = new World();
 
-    auto file = ResourceManager::Load<EntityFile>("Schema/Entities/TeamTest.xml");
-    EntityFilePreprocessor fpp(file);
+    auto file = ResourceManager::Load<EntityXMLFile>("Schema/Entities/TeamTest.xml");
+    EntityXMLFilePreprocessor fpp(file);
     fpp.RegisterComponents(m_World);
-    EntityFileParser fp(file);
+    EntityXMLFileParser fp(file);
     fp.MergeEntities(m_World);
 
     // Create system pipeline