Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing
changes made to b81bb9eeea.

include/Engine/Collision/Collision.h

@@ -20,6 +20,9 @@
 class World;
 struct ComponentWrapper;
 
+template<typename T>
+class Octree;
+
 namespace Collision
 {
 //Return true if the ray hits the box.
@@ -45,20 +48,23 @@ bool RayVsTriangle(const Ray& ray,
     bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray,
-    const std::vector<RawModel::Vertex>& modelVertices,
+    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices);
+    const std::vector<unsigned int>& modelIndices,
+    const glm::mat4& modelMatrix);
 //Return true if the ray hits any of the triangles in the model.
 //Also returns the position of the intersection point. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const std::vector<RawModel::Vertex>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
+    const glm::mat4& modelMatrix,
     glm::vec3& outHitPosition);
 //Return true if the ray hits any of the triangles in the model.
 //Also returns the distance from the ray origin to the closest 
 //intersection point, and the barycentric u,v-coordinates. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const std::vector<RawModel::Vertex>& modelVertices,
+    const RawModel::Vertex* modelVertices,
     const std::vector<unsigned int>& modelIndices,
+    const glm::mat4& modelMatrix,
     float& outDistance,
     float& outUCoord,
     float& outVCoord);
@@ -81,6 +87,13 @@ bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 // Calculates an absolute AABB from an entity AABB component
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
 boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
+//Returns the first entity hit by the input ray. entitiesPotentiallyHitSorted needs to be sorted 
+//by their distance to the ray, e.g. result from Octree<EntityAABB>::ObjectsPossiblyHitByRay.
+//Returns boost::none if none was hit. outDistance will be the distance to the intersection point if the ray intersects.
+boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, std::vector<EntityAABB> entitiesPotentiallyHitSorted, float& outDistance, glm::vec3& outIntersectPos);
+//Returns the first entity hit by the input ray that exists in the octree.
+//outDistance will be the distance to the intersection point if the ray intersects. 
+boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, Octree<EntityAABB>* octree, float& outDistance, glm::vec3& outIntersectPos);
 
 }
 

include/Engine/Core/EAmmoPickup.h

@@ -0,0 +1,18 @@
+#ifndef EAmmoPickup_h__
+#define EAmmoPickup_h__
+
+#include "EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+    struct AmmoPickup : Event
+    {
+        EntityWrapper Player;
+        int AmmoGain;
+    };
+
+}
+
+#endif

include/Engine/Core/EPlayerDamage.h

@@ -9,8 +9,8 @@ namespace Events
 
 struct PlayerDamage : Event
 {
-    //NOTE: this struct is missing information on what the damageSource is
+    EntityWrapper Inflictor;
-    EntityWrapper Player;
+    EntityWrapper Victim;
     double Damage;
 };
 

include/Engine/Core/EShoot.h

@@ -9,7 +9,8 @@ namespace Events
 
 struct Shoot : Event
 {
-    EntityWrapper Player;
+    EntityWrapper Inflictor;
+    double Damage;
 };
 
 }

include/Engine/Core/Octree.h

@@ -41,6 +41,8 @@ public:
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects);
     //Get the objects that are inside the frustum, the objects are put in outObjects.
     void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects);
+    //Get objects, which AABB the input ray intersects, the objects are put in outObjects.
+    void ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects);
     //Empty the tree of all objects, static and dynamic.
     void ClearObjects();
     //Empty the tree of all dynamic objects. Static objects remain in the tree.
@@ -100,6 +102,8 @@ struct Child
     void ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects) const;
     template<typename T>
     void ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObjects, bool takeAllDontTest) const;
+    template<typename T>
+    void ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects) const;
     void ClearObjects();
     void ClearDynamicObjects();
     bool RayCollides(const Ray& ray, Output& data) const;
@@ -119,6 +123,15 @@ struct Child
     std::vector<int> childIndicesContainingBox(const AABB& box) const;
 };
 
+//To be able to sort child nodes and contained objects based on distance to ray origin.
+struct RaySorterInfo
+{
+    int Index;
+    float Distance;
+};
+
+bool isFirstLower(const RaySorterInfo& first, const RaySorterInfo& second);
+
 }
 
 template<typename T>
@@ -164,6 +177,13 @@ void Octree<T>::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& outObje
     m_Root->ObjectsInFrustum(frustum, outObjects, false);
 }
 
+template<typename T>
+void Octree<T>::ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects)
+{
+    falsifyObjectChecks();
+    m_Root->ObjectsPossiblyHitByRay(ray, outObjects);
+}
+
 template<typename T>
 void Octree<T>::ClearObjects()
 {
@@ -282,4 +302,59 @@ void OctSpace::Child::ObjectsInFrustum(const Frustum& frustum, std::vector<T>& o
     }
 }
 
+template<typename T>
+void OctSpace::Child::ObjectsPossiblyHitByRay(const Ray& ray, std::vector<T>& outObjects) const
+{
+    //If the node AABB is missed, everything it contains is missed.
+    if (Collision::RayAABBIntr(ray, m_Box)) {
+        //If the ray shoots the tree, and it is a parent.
+        if (hasChildren()) {
+            //Sort children according to their distance from the ray origin.
+            std::vector<RaySorterInfo> childInfos;
+            childInfos.resize(8);
+            for (int i = 0; i < 8; ++i) {
+                childInfos[i] = { i, glm::distance(ray.Origin(), m_Children[i]->m_Box.Origin()) };
+            }
+            std::sort(childInfos.begin(), childInfos.end(), isFirstLower);
+            //Loop through the children, starting with the one closest to the ray origin. I.e the first to be hit.
+            for (const RaySorterInfo& info : childInfos) {
+                m_Children[info.Index]->ObjectsPossiblyHitByRay(ray, outObjects);
+            }
+        } else {
+            //Check against boxes in the node.
+            bool intersected = false;
+            float dist;
+            //Sort all contained objects according to the distance from the ray origin to 
+            //the intersection, if they are intersecting.
+            std::vector<RaySorterInfo> objectHitInfos;
+            objectHitInfos.reserve(m_StaticObjIndices.size() + m_DynamicObjIndices.size());
+            for (int i : m_StaticObjIndices) {
+                //If we haven't tested against this object before, and the ray hits.
+                if (!m_StaticObjectsRef[i].Checked &&
+                        Collision::RayVsAABB(ray, *m_StaticObjectsRef[i].Box, dist)) {
+                    objectHitInfos.push_back({ i, dist });
+                }
+                m_StaticObjectsRef[i].Checked = true;
+            }
+            for (int i : m_DynamicObjIndices) {
+                //If we haven't tested against this object before, and the ray hits.
+                if (!m_DynamicObjectsRef[i].Checked &&
+                        Collision::RayVsAABB(ray, *m_DynamicObjectsRef[i].Box, dist)) {
+                    objectHitInfos.push_back({ i + (int)m_StaticObjIndices.size(), dist });
+                }
+                m_DynamicObjectsRef[i].Checked = true;
+            }
+            std::sort(objectHitInfos.begin(), objectHitInfos.end(), isFirstLower);
+            int startSize = (int)outObjects.size();
+            outObjects.resize(startSize + objectHitInfos.size());
+            for (int i = 0; i < objectHitInfos.size(); ++i) {
+                outObjects[startSize + i] = (objectHitInfos[i].Index < m_StaticObjIndices.size()) ?
+                    *static_cast<T*>(m_StaticObjectsRef[objectHitInfos[i].Index].Box.get()) :
+                    *static_cast<T*>(m_DynamicObjectsRef[objectHitInfos[i].Index - m_StaticObjIndices.size()].Box.get());
+            }
+        }
+    }
+}
+
+
 #endif

include/Engine/GUI/TextureFrame.h

@@ -3,6 +3,7 @@
 
 #include "Frame.h"
 #include "../Rendering/Texture.h"
+#include "../Rendering/Util/CommonFunctions.h"
 
 namespace GUI
 {
@@ -55,10 +56,10 @@ public:
 			return;
 		}
 
-		m_Texture = ResourceManager::Load<Texture>(resourceName);
+		m_Texture = CommonFunctions::LoadTexture(resourceName, false);
 		m_TextureName = resourceName;
 		if (m_Texture == nullptr) {
-			m_Texture = ResourceManager::Load<Texture>("Textures/Core/ErrorTexture.png");
+			m_Texture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
 		}
 
 		SizeToTexture();

include/Engine/Input/FirstPersonInputController.h

@@ -28,6 +28,7 @@ public:
     virtual void Reset();
 
     void AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer);
+    bool SniperSprintingCheck();
     virtual bool AssaultDashDoubleTapped() const { return m_AssaultDashDoubleTapped; }
     virtual bool PlayerIsDashing() const { return m_PlayerIsDashing; }
 
@@ -202,7 +203,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) {
+    if (m_ShiftDashing && m_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;
@@ -227,7 +228,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f && !isJumping)) {
+    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;
@@ -241,4 +242,12 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     m_EventBroker->Publish(e);
 }
 
+template <typename EventContext>
+bool FirstPersonInputController<EventContext>::SniperSprintingCheck() {
+    if (m_SpecialAbilityKeyDown) {
+        return true;
+    } else {
+        return false;
+    }
+}
 #endif

include/Engine/Network/Client.h

@@ -13,6 +13,8 @@
 #include "Network/Network.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
+#include "Network/UDPClient.h"
+#include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
 #include "Core/EventBroker.h"
@@ -33,17 +35,15 @@ public:
     void Connect(std::string address, int port);
     void Update() override;
 
-private:
+    std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
+    void parseSpawnEvents();
+    // Save for children
     std::unique_ptr<SnapshotFilter> m_SnapshotFilter = nullptr;
 
-    // Assio UDP logic
+    std::string m_Address;
-    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    int m_Port = 0;
-    boost::asio::io_service m_IOService;
-    boost::asio::ip::udp::socket m_Socket;
-
     // Sending message to server logic
     size_t bytesRead = 0;
-    char readBuf[INPUTSIZE] = { 0 };
 
     // Packet loss logic
     PacketID m_PacketID = 0;
@@ -72,16 +72,14 @@ private:
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
-    void readFromServer();
     size_t  receive(char* data);
-    void send(Packet& packet);
-    void connect();
     void disconnect();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
     SharedComponentWrapper createSharedComponent(Packet& packet, EntityID entityID, const ComponentInfo& componentInfo);
     void ignoreFields(Packet& packet, const ComponentInfo& componentInfo);
-    void parseConnect(Packet& packet);
+    void parseUDPConnect(Packet& packet);
+    void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
     void parseKick();
@@ -91,7 +89,7 @@ private:
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
-    bool hasServerTimedOut();
+    void hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     void sendLocalPlayerTransform();
@@ -111,6 +109,10 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
+    void parsePlayerDamage(Packet& packet);
+private:
+    UDPClient m_Unreliable;
+    TCPClient m_Reliable;
 };
 
 #endif

include/Engine/Network/HybridClient.h

@@ -0,0 +1,13 @@
+#ifndef HybridClient_h__
+#define HybridClient_h__
+
+class HybridClient
+{
+public:
+    HybridClient();
+    ~HybridClient();
+private:
+
+};
+
+#endif

include/Engine/Network/HybridServer.h

@@ -0,0 +1,12 @@
+#ifndef HybridServer_h__
+#define HybridServer_h__
+
+class HybridServer
+{
+public:
+    HybridServer();
+    ~HybridServer();
+private:
+};
+
+#endif

include/Engine/Network/MessageType.h

@@ -18,7 +18,8 @@ enum class MessageType
     OnPlayerSpawned,
     EntityDeleted,
     ComponentDeleted,
-    PlayerTransform
+    PlayerTransform,
+    Invalid
 };
 
 #endif

include/Engine/Network/Network.h

@@ -12,7 +12,7 @@
 #include <fstream>
 #include <iostream>
 
-#define INPUTSIZE 32000
+#define BUFFERSIZE 32000
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
 
@@ -35,6 +35,8 @@ protected:
     std::clock_t m_SaveDataTimer;
     unsigned int m_MaxConnections;
     double m_TimeoutMs;
+    void logSentData(int bytesSent);
+    void logReceivedData(int bytesReceived);
     void saveToFile();
     void updateNetworkData();
 };

include/Engine/Network/NetworkClient.h

@@ -0,0 +1,21 @@
+#ifndef NetworkClient_h__
+#define NetworkClient_h__
+
+#include "Network/Packet.h"
+#define BUFFERSIZE 64000
+typedef unsigned int PlayerID;
+typedef unsigned int PacketID;
+
+class NetworkClient
+{
+public:
+    virtual void Connect(std::string playerName, std::string address, int port) = 0;
+    virtual void Disconnect() = 0;
+    virtual void Receive(Packet& packet) = 0;
+    virtual void Send(Packet & packet) = 0;
+    virtual bool IsSocketAvailable() = 0;
+protected:
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
+};
+
+#endif

include/Engine/Network/NetworkServer.h

@@ -0,0 +1,21 @@
+#ifndef NetworkServer_h__
+#define NetworkServer_h__
+#include <boost/asio.hpp>
+#include "Network/Packet.h"
+#include "Network/PlayerDefinition.h"
+#define BUFFERSIZE 64000
+typedef unsigned int PlayerID;
+typedef unsigned int PacketID;
+
+class NetworkServer
+{
+public:
+    virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
+    virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
+    virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
+    virtual void Send(Packet & packet) = 0;
+protected:
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
+};
+
+#endif

include/Engine/Network/Packet.h

@@ -49,10 +49,15 @@ public:
     void WriteData(char* data, int sizeOfData);
     // Pops the first element as if it was a string.
     std::string ReadString();
+    // Construct a packet
+    void ReconstructFromData(char* data, size_t SizeOfData);
+    // Update size of packet variable in header
+    void UpdateSize();
     char* ReadData(int SizeOfData);
     void ChangePacketID(unsigned int& packetID);
     size_t Size() { return m_Offset; };
     char* Data() { return m_Data; };
+    MessageType GetMessageType();
     size_t DataReadSize() { return m_ReturnDataOffset; }
     size_t MaxSize() { return m_MaxPacketSize; }
     size_t HeaderSize() { return m_HeaderSize; }
@@ -64,6 +69,7 @@ private:
     size_t m_MaxPacketSize = 512;
     size_t m_HeaderSize = 0;
     void resizeData();
+    void resizeData(int size);
 };
 
 #endif

include/Engine/Network/PlayerDefinition.h

@@ -2,6 +2,7 @@
 #define PlayerDefinition_h__
 #include <string>
 #include "../Core/Entity.h"
+#include <boost/asio.hpp>
 
 struct PlayerDefinition {
     ::EntityID EntityID = EntityID_Invalid;
@@ -9,6 +10,10 @@ struct PlayerDefinition {
     boost::asio::ip::udp::endpoint Endpoint;
     unsigned int PacketID;
     std::clock_t StopTime;
+    boost::asio::ip::address TCPAddress;
+    unsigned short TCPPort;
+    // use for tcp connections
+    boost::shared_ptr<boost::asio::ip::tcp::socket> TCPSocket;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -5,8 +5,9 @@
 #include <ctime>
 
 #include <glm/common.hpp>
-#include <boost/asio/ip/udp.hpp>
 
+#include "Network/TCPServer.h"
+#include "Network/UDPServer.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -28,28 +29,29 @@ public:
     void Update() override;
 
 private:
+    // Network channels
+    TCPServer m_Reliable;
+    UDPServer m_Unreliable;
+    // dont forget to set these in the childrens receive logic
+    boost::asio::ip::address m_Address;
     int m_Port = 27666;
-    // UDP logic
-    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
-    boost::asio::io_service m_IOService;
-    std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
+    std::vector<PlayerID> m_PlayersToDisconnect;
     // HACK: Fix INPUTSIZE
-    char readBuffer[INPUTSIZE] = { 0 };
+    char readBuffer[BUFFERSIZE] = { 0 };
     size_t bytesRead = 0;
     // time for previouse message
     std::clock_t previousePingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
     std::clock_t timOutTimer = std::clock();
+
     // How often we send messages (milliseconds)
     float pingIntervalMs;
     float snapshotInterval;
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
-
     //Timers
     std::clock_t m_StartPingTime;
     
@@ -58,11 +60,9 @@ private:
     PacketID m_PreviousPacketID = 0;
 
     // Private member functions
-    size_t receive(char* data);
+    //int  receive(char* data);
-    void readFromClients();
+    void reliableBroadcast(Packet& packet);
-    void send(PlayerID player, Packet& packet);
+    void unreliableBroadcast(Packet& packet);
-    void send(Packet& packet);
-    void broadcast(Packet& packet);
     void sendSnapshot();
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
@@ -70,15 +70,19 @@ private:
     void checkForTimeOuts();
     void disconnect(PlayerID playerID);
     void parseMessageType(Packet& packet);
-    void parseOnInputCommand(Packet& packet);
     void parseOnPlayerDamage(Packet& packet);
-    void parseConnect(Packet& packet);
-    void parseDisconnect();
-    void parseClientPing();
-    void parsePing();
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
+    PlayerID GetPlayerIDFromEndpoint();
+    void parsePlayerTransform(Packet& packet);
+    void parseOnInputCommand(Packet& packet);
+    void parseClientPing();
+    void parsePing();    
+    void parseUDPConnect(Packet & packet);
+    void parseTCPConnect(Packet & packet);
+    void parseDisconnect();
+    bool shouldSendToClient(EntityWrapper childEntity);
+
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
@@ -88,7 +92,8 @@ private:
     bool OnEntityDeleted(const Events::EntityDeleted& e);
     EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
-    void parsePlayerTransform(Packet& packet);
+    EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(const Events::PlayerDamage& e);
 };
 
 #endif

include/Engine/Network/TCPClient.h

@@ -0,0 +1,28 @@
+#ifndef TCPClient_h__
+#define TCPClient_h__
+
+#include <boost/asio.hpp>
+#include "NetworkClient.h"
+
+class TCPClient : public NetworkClient
+{
+public:
+    TCPClient();
+    ~TCPClient();
+
+    void Connect(std::string playerName, std::string address, int port);
+    void Disconnect();
+    void Receive(Packet& packet);
+    void Send(Packet & packet);
+    bool IsSocketAvailable();
+private:
+    // Assio TCP logic
+    boost::asio::ip::tcp::endpoint m_Endpoint;
+    boost::asio::io_service m_IOService;
+    std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
+    size_t readBuffer(char* data);
+    PacketID m_SendPacketID = 0;
+    bool m_IsConnected = false;
+};
+
+#endif

include/Engine/Network/TCPServer.h

@@ -0,0 +1,31 @@
+#ifndef TCPServer_h__
+#define TCPServer_h__
+
+#include <boost/asio.hpp>
+#include <boost/bind.hpp>
+#include <map>
+#include "NetworkServer.h"
+
+class TCPServer : public NetworkServer
+{
+public:
+    TCPServer();
+    ~TCPServer();
+    void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
+    void Receive(Packet & packet, PlayerDefinition & playerDefinition);
+    void Send(Packet & packet, PlayerDefinition & playerDefinition);
+    void Send(Packet & packet);
+    void Disconnect();
+private:
+    // TCP logic
+    boost::asio::io_service m_IOService;
+    std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
+    boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
+
+    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
+        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        const boost::system::error_code& error);
+    int readBuffer(char* data, PlayerDefinition& playerDefinition);
+};
+
+#endif

include/Engine/Network/UDPClient.h

@@ -0,0 +1,27 @@
+#ifndef UDPClient_h__
+#define UDPClient_h__
+
+#include <boost/asio.hpp>
+#include "Network/NetworkClient.h"
+
+class UDPClient : public NetworkClient
+{
+public:
+    UDPClient();
+    ~UDPClient();
+
+    void Connect(std::string playerName, std::string address, int port);
+    void Disconnect();
+    void Receive(Packet& packet);
+    void Send(Packet & packet);
+    bool IsSocketAvailable();
+private:
+    // Assio UDP logic
+    boost::asio::io_service m_IOService;
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
+    int readBuffer(char* data);
+    PacketID m_SendPacketID = 0;
+};
+
+#endif

include/Engine/Network/UDPServer.h

@@ -0,0 +1,25 @@
+#ifndef UDPServer_h__
+#define UDPServer_h__
+
+#include "NetworkServer.h"
+#include <boost/asio/ip/udp.hpp>
+
+class UDPServer : public NetworkServer
+{
+public:
+    UDPServer();
+    ~UDPServer();
+    void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
+    void Receive(Packet & packet, PlayerDefinition & playerDefinition);
+    void Send(Packet & packet, PlayerDefinition & playerDefinition);
+    void Send(Packet & packet);
+    bool IsSocketAvailable();
+private:
+    // UDP logic
+    boost::asio::io_service m_IOService;
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
+    int readBuffer(char* data);
+};
+
+#endif

include/Engine/Rendering/Camera.h

@@ -33,6 +33,8 @@ public:
 	glm::mat4 ViewMatrix() const { return m_ViewMatrix; }
     void SetViewMatrix(glm::mat4 val);
 
+    glm::mat4 BillboardMatrix();
+
 	float AspectRatio() const { return m_AspectRatio; }
 	void SetAspectRatio(float val);
 

include/Engine/Rendering/DrawFinalPass.h

@@ -7,6 +7,7 @@
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
+#include "Util/CommonFunctions.h"
 #include "Texture.h"
 
 class DrawFinalPass
@@ -35,6 +36,7 @@ private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
 
+    void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
     void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -50,6 +52,7 @@ private:
     Texture* m_BlackTexture;
     Texture* m_NeutralNormalTexture;
     Texture* m_GreyTexture;
+    Texture* m_ErrorTexture;
 
     FrameBuffer m_FinalPassFrameBuffer;
     FrameBuffer m_FinalPassFrameBufferLowRes;
@@ -69,6 +72,7 @@ private:
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 	ShaderProgram* m_ExplosionEffectSplatMapProgram;
+    ShaderProgram* m_SpriteProgram;
 	ShaderProgram* m_ForwardPlusSplatMapProgram;
     ShaderProgram* m_ShieldToStencilProgram;
     ShaderProgram* m_FillDepthBufferProgram;

include/Engine/Rendering/Model.h

@@ -2,6 +2,7 @@
 #define Model_h__
 
 #include "Rendering/RawModelCustom.h"
+#include "Util/CommonFunctions.h"
 //#include "Rendering/RawModelAssimp.h"
 #include "../OpenGL.h"
 #include "Core/AABB.h"

include/Engine/Rendering/ModelJob.h

@@ -120,6 +120,32 @@ struct ModelJob : RenderJob
 
         if (model->IsSkinned()) {
             Skeleton = Model->m_RawModel->m_Skeleton;
+
+            if (Skeleton != nullptr) {
+                if (world->HasComponent(Entity, "Animation")) {
+                    auto animationComponent = world->GetComponent(Entity, "Animation");
+
+                    for (int i = 1; i <= 3; i++) {
+                        ::Skeleton::AnimationData animationData;
+                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
+                        if (animationData.animation == nullptr) {
+                            continue;
+                        }
+                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
+                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
+
+                        Animations.push_back(animationData);
+                    }
+                }
+
+                if (world->HasComponent(Entity, "AnimationOffset")) {
+                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
+                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
+                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
+                } else {
+                    AnimationOffset.animation = nullptr;
+                }
+            }
         }
             
     };
@@ -140,8 +166,8 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-   // const ::Skeleton::Animation* Animation = nullptr;
+    std::vector<::Skeleton::AnimationData> Animations;
-
+    ::Skeleton::AnimationOffset AnimationOffset;
     
 
 

include/Engine/Rendering/PNG.h

@@ -6,9 +6,10 @@
 #include <png.h>
 
 #include "../Common.h"
+#include "../Core/ResourceManager.h"
 #include "Image.h"
 
-class PNG : public Image
+class PNG : public Image, public Resource
 {
 public:
 	PNG(std::string path);

include/Engine/Rendering/RawModelCustom.h

@@ -50,7 +50,7 @@ public:
 	struct TextureProperties {
 		std::string TexturePath;
 		glm::vec2 UVRepeat;
-		std::shared_ptr<::Texture> Texture;	
+		Texture* Texture;	
 	};
 	
     struct MaterialBasic

include/Engine/Rendering/RenderQueue.h

@@ -15,6 +15,7 @@
 #include "PointLightJob.h"
 #include "DirectionalLightJob.h"
 #include "ExplosionEffectJob.h"
+#include "SpriteJob.h"
 
 struct RenderScene
 {
@@ -25,6 +26,7 @@ struct RenderScene
         std::list<std::shared_ptr<RenderJob>> OpaqueShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> TransparentShieldedObjects;
         std::list<std::shared_ptr<RenderJob>> ShieldObjects;
+        std::list<std::shared_ptr<RenderJob>> SpriteJob;
         std::list<std::shared_ptr<RenderJob>> PointLight;
         std::list<std::shared_ptr<RenderJob>> Text;
         std::list<std::shared_ptr<RenderJob>> DirectionalLight;
@@ -41,7 +43,7 @@ struct RenderScene
         Jobs.OpaqueShieldedObjects.clear();
         Jobs.TransparentShieldedObjects.clear();
         Jobs.ShieldObjects.clear();
-        Jobs.Text.clear();
+        Jobs.SpriteJob.clear();
         Jobs.DirectionalLight.clear();
 	}
 };

include/Engine/Rendering/RenderSystem.h

@@ -18,6 +18,7 @@
 #include "../Core/EPlayerSpawned.h"
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
+#include "../Core/ConfigFile.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -47,6 +48,10 @@ private:
     void fillPointLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillDirectionalLights(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
     void fillLight(std::list<std::shared_ptr<RenderJob>>& jobs);
+    void fillSprites(std::list<std::shared_ptr<RenderJob>>& jobs, World* world);
+
+    bool isEntityVisible(EntityWrapper& entity);
+
     bool isChildOfACamera(EntityWrapper entity);
     bool isChildOfCurrentCamera(EntityWrapper entity);
 };

include/Engine/Rendering/Renderer.h

@@ -22,6 +22,7 @@
 #include "../Core/Transform.h"
 #include "imgui/imgui.h"
 #include "TextPass.h"
+#include "Util/CommonFunctions.h"
 
 class Renderer : public IRenderer
 {

include/Engine/Rendering/Skeleton.h

@@ -100,50 +100,29 @@ public:
 
 	int GetBoneID(std::string name);
 
-    void CalculateFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
+    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    void CalculateFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
+    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
 
     const Animation* GetAnimation(std::string name);
 
-    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, const Bone* bone, glm::mat4 parentMatrix);
+    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, const Bone* bone, glm::mat4 parentMatrix);
+    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
 
     void PrintSkeleton();
 	void PrintSkeleton(const Bone* parent, int depthCount);
 	std::map<std::string, Animation> Animations;
 
     glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
+    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
+    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
     int GetKeyframe(const Animation& animation, double time);
 
-
-    std::vector<glm::mat4> GetBones()
-    {
-        std::vector<glm::mat4> finalMatrices;
-        for (auto &kv : m_BoneLocalTransforms) {
-            finalMatrices.push_back(kv.second);
-        }
-        return finalMatrices;;
-    }
-
-    glm::mat4 GetBoneTransformSuper(int boneID)
-    {
-        if(m_BoneTransforms.find(boneID) != m_BoneTransforms.end()) {
-            return m_BoneTransforms.at(boneID);
-        } else {
-            return glm::mat4(1);
-        }
-    }
-
 private:
 
     glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
 
 	std::map<std::string, Bone*> m_BonesByName;
-    float aim = 0.f;
     
-
-    std::map<int, glm::mat4> m_BoneLocalTransforms;
-    std::map<int, glm::mat4> m_BoneTransforms;
 };
 
 #endif

include/Engine/Rendering/SpriteJob.h

@@ -0,0 +1,73 @@
+#ifndef SpriteJob_h__
+#define SpriteJob_h__
+
+#include <cstdint>
+
+#include "../Common.h"
+#include "../GLM.h"
+#include "../Core/ComponentWrapper.h"
+#include "Texture.h"
+#include "Model.h"
+#include "RenderJob.h"
+#include "../Core/ResourceManager.h"
+#include "Camera.h"
+#include "../Core/World.h"
+#include "../Core/Transform.h"
+#include "Skeleton.h"
+
+struct SpriteJob : RenderJob
+{
+    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
+        : RenderJob()
+    {
+        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
+        ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
+        TextureID = 0;
+
+        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+
+        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+
+        StartIndex = matProp.material->StartIndex;
+        EndIndex = matProp.material->EndIndex;
+        Matrix = matrix;
+        Color = cSprite["Color"];
+        Entity = cSprite.EntityID;
+        Position = Transform::AbsolutePosition(world, cSprite.EntityID);
+        Depth = 0;
+        if (depthSorted) {
+            glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
+            Depth = viewpos.z;
+        }
+        World = world;
+
+        FillColor = fillColor;
+        FillPercentage = fillPercentage;
+    };
+
+    unsigned int TextureID;
+
+    EntityID Entity;
+    glm::mat4 Matrix;
+    const Texture* DiffuseTexture;
+    const Texture* NormalTexture;
+    const Texture* SpecularTexture;
+    const Texture* IncandescenceTexture;
+    float Shininess = 0.f;
+    glm::vec4 Color;
+    glm::vec3 Position;
+    const ::Model* Model = nullptr;
+    unsigned int StartIndex = 0;
+    unsigned int EndIndex = 0;
+    World* World;
+
+    glm::vec4 FillColor = glm::vec4(0);
+    float FillPercentage = 0.0;
+
+    void CalculateHash() override
+    {
+        Hash = TextureID;
+    }
+};
+
+#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -4,14 +4,11 @@
 #include "../../Common.h"
 #include "../../OpenGL.h"
 #include "../../GLM.h"
+#include "../Texture.h"
 
-class CommonFuntions
+namespace CommonFunctions
 { 
-public:
+Texture* LoadTexture(std::string path, bool threaded);
-    CommonFuntions() = delete;
-
-private:
-
 };
 
 #endif

include/Game/MiniDump.h

@@ -0,0 +1,8 @@
+#ifndef MiniDump_h__
+#define MiniDump_h__
+
+#include <Windows.h>
+
+void WINAPI Create_Dump(PEXCEPTION_POINTERS pException, BOOL File_Flag, BOOL Show_Flag);
+
+#endif

include/Game/Systems/AmmoPickupSystem.h

@@ -0,0 +1,32 @@
+#ifndef AmmoPickupSystem_h__
+#define AmmoPickupSystem_h__
+
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPickupSpawned.h"
+#include "Core/EAmmoPickup.h"
+#include "Engine/Collision/ETrigger.h"
+#include "Common.h"
+
+class AmmoPickupSystem : public ImpureSystem
+{
+public:
+    AmmoPickupSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<AmmoPickupSystem, Events::TriggerTouch> m_ETriggerTouch;
+    bool OnTriggerTouch(Events::TriggerTouch& e);
+
+    struct NewAmmoPickup {
+        glm::vec3 Pos;
+        double AmmoGain;
+        double RespawnTimer;
+        double DecreaseThisRespawnTimer;
+    };
+    std::vector<NewAmmoPickup> m_ETriggerTouchVector;
+};
+#endif

include/Game/Systems/AmmunitionHUDSystem.h

@@ -0,0 +1,17 @@
+#ifndef AmmunitionHUDSystem_h__
+#define AmmunitionHUDSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+
+class AmmunitionHUDSystem : public ImpureSystem
+{
+public:
+    AmmunitionHUDSystem(SystemParams params)
+        : System(params)
+    { }
+
+    virtual void Update(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/EntityFileParser.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/CapturePointHUDSystem.h

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

include/Game/Systems/CapturePointSystem.h

@@ -44,7 +44,6 @@ private:
 
     //std::vector<ComponentWrapper>
 
-    const double m_CaptureTimeToTakeOver = 15.0;
     bool m_ResetTimers = false;
 
     //vectors which will keep track of enter/leave changes

include/Game/Systems/DamageIndicatorSystem.h

@@ -0,0 +1,33 @@
+#ifndef DamageIndicatorSystem_h__
+#define DamageIndicatorSystem_h__
+
+#include "Core/System.h"
+#include "Core/Transform.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFileParser.h"
+#include "Core/EPlayerDamage.h"
+#include "Common.h"
+#include <tuple>
+
+#include "Rendering/ESetCamera.h"
+#include <glm/gtc/quaternion.hpp>
+#include <glm/gtx/vector_angle.hpp>
+
+#include "Rendering/Util/CommonFunctions.h"
+
+class DamageIndicatorSystem : public System
+{
+public:
+    DamageIndicatorSystem(SystemParams params);
+
+private:
+    EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(Events::PlayerDamage& e);
+
+    EventRelay<DamageIndicatorSystem, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);
+
+    EntityID m_CurrentCamera = -1;
+
+};
+#endif

include/Game/Systems/HealthHUDSystem.h

@@ -3,13 +3,11 @@
 
 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
-#include "../../Engine/Rendering/ESetCamera.h"
-#include <imgui/imgui.h>
 
-class PlayerHUDSystem : public ImpureSystem
+class HealthHUDSystem : public ImpureSystem
 {
 public:
-    PlayerHUDSystem(SystemParams params)
+    HealthHUDSystem(SystemParams params)
         : System(params)
     { }
 

include/Game/Systems/HealthSystem.h

@@ -9,6 +9,8 @@
 #include "Core/EPlayerDamage.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
+#include "Core/ConfigFile.h"
+#include "Input/EInputCommand.h"
 
 #include <tuple>
 #include <vector>
@@ -23,11 +25,15 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
+    bool m_NetworkEnabled;
+
     //methods which will take care of specific events
     EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
     bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
     bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);
+    EventRelay<HealthSystem, Events::InputCommand> m_InputCommand;
+    bool HealthSystem::OnInputCommand(Events::InputCommand& e);
     
     //vector which will keep track of health changes
     std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;

include/Game/Systems/KillFeedSystem.h

@@ -0,0 +1,39 @@
+#ifndef KillFeedSystem_h__
+#define KillFeedSystem_h__
+
+#include "../../Engine/Core/System.h"
+#include "../../Engine/GLM.h"
+#include "Core/EPlayerDeath.h"
+
+class KillFeedSystem : public ImpureSystem
+{
+public:
+    KillFeedSystem(SystemParams params)
+        : System(params)
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
+
+    }
+
+    virtual void Update(double dt) override;
+
+private:
+
+
+
+
+    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
+    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
+
+    struct KillFeedInfo
+    {
+        std::string Content;
+        glm::vec4 Color;
+        float TimeToLive = 5.f;
+    };
+
+    std::list<KillFeedInfo> m_DeathQueue;
+
+};
+
+#endif

include/Game/Systems/PlayerSpawnSystem.h

@@ -14,6 +14,8 @@ public:
 
     virtual void Update(double dt) override;
     
+    static void SetRespawnTime(float respawnTime) { m_RespawnTime = respawnTime; };
+
 private:
     struct SpawnRequest
     {
@@ -23,10 +25,19 @@ private:
 
     bool m_NetworkEnabled = false;
     std::vector<SpawnRequest> m_SpawnRequests;
+
+    //Player ID -> EntityWrapper.
     std::map<int, EntityWrapper> m_PlayerEntities;
+    //EntityWrapper ID -> Player ID.
+    std::map<EntityID, int> m_PlayerIDs;
+
+    static float m_RespawnTime;
+    float m_Timer;
 
     EventRelay<PlayerSpawnSystem, Events::InputCommand> m_OnInputCommand;
-    bool OnInputCommand(const Events::InputCommand& e);
+    bool OnInputCommand(Events::InputCommand& e);
     EventRelay<PlayerSpawnSystem, Events::PlayerSpawned> m_OnPlayerSpawnerd;
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
+    EventRelay<PlayerSpawnSystem, Events::PlayerDeath> m_OnPlayerDeath;
+    bool OnPlayerDeath(Events::PlayerDeath& e);
 };

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -0,0 +1,49 @@
+#include "Sound/EPlaySoundOnEntity.h"
+#include "Collision/Collision.h"
+#include "Rendering/AnimationSystem.h"
+#include "Core/ConfigFile.h"
+#include "WeaponBehaviour.h"
+#include "../SpawnerSystem.h"
+#include "Core/EPlayerDamage.h"
+#include "Core/EShoot.h"
+
+
+class AssaultWeaponBehaviour : public WeaponBehaviour
+{
+public:
+    AssaultWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
+    
+    virtual void Fire() override;
+    virtual void CeaseFire() override;
+    virtual void Reload() override;
+
+    virtual void Update(double dt) override;
+
+private:
+    EntityWrapper m_FirstPersonModel;
+    EntityWrapper m_ThirdPersonModel;
+    // State
+    bool m_Firing = false;
+    bool m_Reloading = false;
+    double m_ReloadTimer = 0.0;
+    EntityWrapper m_FirstPersonReloadImpersonator;
+    EntityWrapper m_ThirdPersonReloadImpersonator;
+    double m_TimeSinceLastFire = 0.0;
+
+    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
+    bool OnAnimationComplete(Events::AnimationComplete& e);
+
+    bool hasAmmo();
+    void fireRound();
+    void spawnTracer();
+    float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
+    void playFireSound();
+    void playEmptySound();
+    void viewPunch();
+    void finishReload();
+    void playShootAnimation();
+    void playIdleAnimation();
+    void playReloadAnimation();
+    bool shoot(double damage);
+    void showHitMarker();
+};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -0,0 +1,34 @@
+#ifndef WeaponBehaviour_h__
+#define WeaponBehaviour_h__
+
+#include "Core/System.h"
+#include "Rendering/IRenderer.h"
+#include "Core/Octree.h"
+#include "Collision/EntityAABB.h"
+
+class WeaponBehaviour : public System
+{
+public:
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+        : System(systemParams)
+        , m_Renderer(renderer)
+        , m_CollisionOctree(collisionOctree)
+        , m_Player(player)
+    { }
+    virtual ~WeaponBehaviour() = default;
+
+    WeaponBehaviour(const WeaponBehaviour&) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+
+    virtual void Fire() = 0;
+    virtual void CeaseFire() { }
+    virtual void Reload() { }
+    virtual void Update(double dt) { }
+
+protected:
+    IRenderer* m_Renderer;
+    Octree<EntityAABB>* m_CollisionOctree;
+    EntityWrapper m_Player;
+};
+
+#endif

include/Game/Systems/Weapon/WeaponSystem.h

@@ -0,0 +1,44 @@
+#ifndef WeaponSystem_h__
+#define WeaponSystem_h__
+
+#include "Rendering/IRenderer.h"
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Core/EPlayerDamage.h"
+#include "Core/EShoot.h"
+#include "Core/EPlayerSpawned.h"
+#include "Input/EInputCommand.h"
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
+#include "Core/Octree.h"
+#include "Collision/EntityAABB.h"
+#include "Systems/SpawnerSystem.h"
+#include "Sound/EPlaySoundOnEntity.h"
+#include "AssaultWeaponBehaviour.h"
+
+class WeaponSystem : public PureSystem, ImpureSystem
+{
+public:
+    WeaponSystem(SystemParams params, IRenderer* renderer, Octree<EntityAABB>* collisionOctree);
+
+    virtual void Update(double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) override;
+
+private:
+    SystemParams m_SystemParams;
+    IRenderer* m_Renderer;
+    Octree<EntityAABB>* m_CollisionOctree;
+
+    std::unordered_map<EntityWrapper, std::shared_ptr<WeaponBehaviour>> m_ActiveWeapons;
+
+    // Events
+    EventRelay<WeaponSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawned(Events::PlayerSpawned& e);
+    EventRelay<WeaponSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(Events::InputCommand& e);
+
+    void selectWeapon(EntityWrapper player, ComponentInfo::EnumType slot);
+};
+
+#endif

include/Game/Systems/WeaponSystem.h

@@ -1,192 +0,0 @@
-#ifndef WeaponSystem_h__
-#define WeaponSystem_h__
-
-//#include <GLFW/glfw3.h>
-//#include <glm/common.hpp>
-#include "Rendering/IRenderer.h"
-
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/EPlayerDamage.h"
-#include "Core/EShoot.h"
-#include "Core/EPlayerSpawned.h"
-#include "Input/EInputCommand.h"
-#include "Core/EntityFile.h"
-#include "Core/EntityFileParser.h"
-#include "Core/Octree.h"
-#include "Collision/EntityAABB.h"
-#include "Systems/SpawnerSystem.h"
-#include "Sound/EPlaySoundOnEntity.h"
-
-class WeaponBehaviour;
-
-class WeaponSystem : public PureSystem, ImpureSystem
-{
-public:
-    WeaponSystem(SystemParams params, IRenderer* renderer, Octree<EntityAABB>* collisionOctree);
-
-    virtual void Update(double dt) override;
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) override;
-
-private:
-    SystemParams m_SystemParams;
-    IRenderer* m_Renderer;
-    Octree<EntityAABB>* m_CollisionOctree;
-
-    std::unordered_map<EntityWrapper, std::shared_ptr<WeaponBehaviour>> m_ActiveWeapons;
-
-    // Events
-    EventRelay<WeaponSystem, Events::PlayerSpawned> m_EPlayerSpawned;
-    bool OnPlayerSpawned(Events::PlayerSpawned& e);
-    EventRelay<WeaponSystem, Events::Shoot> m_EShoot;
-    bool OnShoot(Events::Shoot& e);
-    EventRelay<WeaponSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(Events::InputCommand& e);
-
-    void selectWeapon(EntityWrapper player, ComponentInfo::EnumType slot);
-};
-
-class WeaponBehaviour : public System
-{
-public:
-    WeaponBehaviour(SystemParams systemParams, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity)
-        : System(systemParams)
-        , m_CollisionOctree(collisionOctree)
-        , m_Entity(weaponEntity)
-    { }
-    virtual ~WeaponBehaviour() = default;
-
-    WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
-
-    virtual void Fire() = 0;
-    virtual void CeaseFire() { }
-    virtual void Reload() { }
-    virtual void Update(double dt) { }
-
-protected:
-    Octree<EntityAABB>* m_CollisionOctree;
-    EntityWrapper m_Entity;
-};
-
-class AssaultWeaponBehaviour : public WeaponBehaviour
-{
-public:
-    AssaultWeaponBehaviour(SystemParams systemParams, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity)
-        : WeaponBehaviour(systemParams, collisionOctree, weaponEntity)
-    { }
-    
-    virtual void Fire() override
-    {
-        m_TimeSinceLastFire = 0.0;
-        m_Firing = true;
-        fireRound();
-    }
-
-    virtual void CeaseFire() override
-    {
-        m_Firing = false;
-    }
-
-    virtual void Reload() override
-    {
-        ComponentWrapper& cAssaultWeapon = m_Entity["AssaultWeapon"];
-
-        int& magAmmo = cAssaultWeapon["MagazineAmmo"];
-        int magSize = cAssaultWeapon["MagazineSize"];
-        int& ammo = cAssaultWeapon["Ammo"];
-
-        // Don't reload if we're already fully loaded
-        if (magAmmo == magSize) {
-            return;
-        }
-
-        // Throw away rounds in magazine to incentivise ammo sharing
-        int toLoad = glm::min(magSize, ammo);
-        magAmmo = toLoad;
-        ammo -= toLoad;
-    }
-
-    virtual void Update(double dt) override
-    {
-        if (!m_Firing) {
-            return;
-        }
-
-        m_TimeSinceLastFire += dt;
-
-        ComponentWrapper& cAssaultWeapon = m_Entity["AssaultWeapon"];
-        if (m_TimeSinceLastFire >= 1.0 / ((double)cAssaultWeapon["RPM"] / 60.0)) {
-            fireRound();
-        }
-    }
-
-private:
-    bool m_Firing = false;
-    double m_TimeSinceLastFire = 0.0;
-    EntityFile* m_RayRed = nullptr;
-    EntityFile* m_RayBlue = nullptr;
-
-    void fireRound()
-    {
-        ComponentWrapper& cAssaultWeapon = m_Entity["AssaultWeapon"];
-
-        int& magAmmo = cAssaultWeapon["MagazineAmmo"];
-        int ammo = cAssaultWeapon["Ammo"];
-
-        // Reload if our magazine is empty
-        if (magAmmo <= 0) {
-            Reload();
-            return;
-        }
-
-        // Fire
-        magAmmo -= 1;
-        spawnTracer();
-        playSound();
-
-        m_TimeSinceLastFire = 0.0;
-    }
-
-    void spawnTracer()
-    {
-        if (!IsClient) {
-            return;
-        }
-
-        EntityWrapper spawner;
-        if (m_Entity == LocalPlayer) {
-            spawner = m_Entity.FirstChildByName("WeaponMuzzle");
-        } else {
-            spawner = m_Entity.FirstChildByName("ThirdPersonWeaponMuzzle");
-        }
-
-        if (!spawner.Valid()) {
-            return;
-        }
-
-        Events::SpawnerSpawn e;
-        e.Spawner = spawner;
-        m_EventBroker->Publish(e);
-    }
-
-    float traceRayDistance(glm::vec3 origin, glm::vec3 direction)
-    {
-        // TODO: Cast a ray and size tracer appropriately
-        return 100.f;
-    }
-
-    void playSound()
-    { 
-        if (!IsClient) {
-            return;
-        }
-
-        Events::PlaySoundOnEntity e;
-        e.EmitterID = m_Entity.ID;
-        e.FilePath = "Audio/laser/laser1.wav";
-        m_EventBroker->Publish(e);
-    }
-};
-
-#endif

resources/DefaultConfig.ini

@@ -4,6 +4,9 @@ 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
+EditorEnabled=false
+OutOfBodyExperience=false
 
 [Editor]
 CameraSpeed=3
@@ -20,7 +23,7 @@ StartNetwork=false
 IsServer=false
 Name=Bob
 Address=127.0.0.1
-Port=13
+Port=27666
 MaxConnections=8
 SnapshotInterval=0.05
 SendInputIntervalMs=33

resources/DefaultInput.ini

@@ -25,3 +25,4 @@ C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient
 P=SwitchToPlayer
+K=TakeDamage,1500

resources/Schema/Components.xsd

@@ -32,9 +32,19 @@
 	<xs:include schemaLocation="Components/Lifetime.xsd"/>
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
+	<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"/>
+	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
+	<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
+	<xs:include schemaLocation="Components/KillFeed.xsd"/>
 </xs:schema>

resources/Schema/Components/AmmoPickup.xml

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

resources/Schema/Components/AmmoPickup.xsd

@@ -0,0 +1,21 @@
+<?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="AmmoPickup">
+		<xs:annotation>
+			<xs:documentation>An Ammo Pickup</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="RespawnTimer" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The respawn timer for a ammo pickup</xs:documentation></xs:annotation>
+				</xs:element>			
+				<xs:element name="AmmoGain" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>How much percent ammo gain the player will get</xs:documentation></xs:annotation>
+				</xs:element>			
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/AmmunitionHUD.xml

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

resources/Schema/Components/AmmunitionHUD.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:include schemaLocation="../Types/TeamEnum.xsd"/>
+	<xs:element name="AmmunitionHUD">
+		<xs:annotation>
+			<xs:documentation>Hud element for tracking ammunition from parent with AssaultWeapon component. Child with the name "MagazineAmmo" tracks clip ammunition. Child with the name "Ammo" tracks ammo.</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/AssaultWeapon.xml

@@ -6,4 +6,6 @@
 	<MaxAmmo>360</MaxAmmo>
 	<BaseDamage>5</BaseDamage>
 	<RPM>120</RPM>
+	<ViewPunch>0.01</ViewPunch>
+	<ReloadTime>2</ReloadTime>
 </AssaultWeapon>

resources/Schema/Components/AssaultWeapon.xsd

@@ -22,6 +22,12 @@
 				<xs:element name="RPM" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Rate of fire in rounds per minute</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>View punch in radians for each bullet fired</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>Time it takes to reload the weapon in seconds</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

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/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/CapturePoint.xml

@@ -2,5 +2,6 @@
 <CapturePoint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CapturePoint.xsd">
 	<CapturePointNumber>0</CapturePointNumber>
 	<CaptureTimer>0</CaptureTimer>
+	<CapturePointMaxTimer>15</CapturePointMaxTimer>
 	<HomePointForTeam><Spectator/></HomePointForTeam>
 </CapturePoint>

resources/Schema/Components/CapturePoint.xsd

@@ -20,7 +20,11 @@
 						<xs:documentation>CapturePointNumber specify an int number for this</xs:documentation>
 					</xs:annotation>
 				</xs:element>
-
+				<xs:element name="CapturePointMaxTimer" type="t:double" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>The time needed to take over a Capture Point</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 				<xs:element name="HomePointForTeam" type="TeamEnum" minOccurs="0">
 					<xs:annotation>
 						<xs:documentation>Specify if this is a HomePoint for either team</xs:documentation>

resources/Schema/Components/CapturePointHUD.xml

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

resources/Schema/Components/CapturePointHUD.xsd

@@ -0,0 +1,24 @@
+<?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:include schemaLocation="../Types/TeamEnum.xsd"/>
+	<xs:element name="CapturePointHUD">
+		<xs:annotation>
+			<xs:documentation>Hud element for tracking capture points.</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="CapturePointNumber" type="t:int" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Corresponds to the number on the capture point it should track.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="Owner" type="TeamEnum" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>Specify the team that own this capturePoint.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/KillFeed.xml

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

resources/Schema/Components/KillFeed.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="KillFeed">
+		<xs:annotation>
+			<xs:documentation>HUD element for tracking the 3 last kills, printed on the children with the names "KillFeed1", "KillFeed2", "KillFeed3"</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Player.xml

@@ -2,4 +2,5 @@
 <Player xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Player.xsd">
 	<MovementSpeed>3</MovementSpeed>
 	<CrouchSpeed>1.5</CrouchSpeed>
+	<CurrentWishDirection X="0" Y="0" Z="0"/>
 </Player>

resources/Schema/Components/Player.xsd

@@ -5,12 +5,13 @@
 
 	<xs:element name="Player">
 		<xs:annotation>
-			<xs:documentation>The player charachter</xs:documentation>
+			<xs:documentation>The player entity</xs:documentation>
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="MovementSpeed" type="t:float" minOccurs="0"/>
 				<xs:element name="CrouchSpeed" type="t:float" minOccurs="0"/>
+				<xs:element name="CurrentWishDirection" type="t:Vector" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

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">
+	<StrengthOfEffect>2.0</StrengthOfEffect>
+</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="StrengthOfEffect" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Sprite.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Sprite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Sprite.xsd">
+	<DiffuseTexture></DiffuseTexture>
+	<GlowMap></GlowMap>
+	<Color R="1" G="1" B="1" A="1"/>
+	<Visible>true</Visible>
+	<DepthSort>true</DepthSort>
+</Sprite>

resources/Schema/Components/Sprite.xsd

@@ -0,0 +1,30 @@
+<?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="Sprite">
+		<xs:annotation>
+			<xs:documentation>A sprite that will be facing the camera</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="DiffuseTexture" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>Diffuse Texture file</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="GlowMap" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>GlowMap file</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Color" type="t:Color" minOccurs="0">
+					<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Visible" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="DepthSort" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Text.xml

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

resources/Schema/Entities/AmmoHUD

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="AmmunitionHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AmmunitionHUD/>
+    <c:Transform>
+      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
+      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="AmmunitionHUDBackground">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.00200000009"/>
+          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="MagazineAmmo">
+          <Components>
+            <c:Text>
+              <Content>0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Ammo">
+          <Components>
+            <c:Text>
+              <Content>360</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform>
+          <Position X="-0.00200000009" Y="0.00400000019" Z="-0.00100000005"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="MagazineAmmo">
+          <Components>
+            <c:Text>
+              <Content>0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Ammo">
+          <Components>
+            <c:Text>
+              <Content>360</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/AmmoPickup.xml

@@ -0,0 +1,23 @@
+<?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:AABB/>
+    <c:AmmoPickup/>
+    <c:Model>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+    </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
+    <c:Transform>
+      <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
+    </c:Transform>
+    <c:Trigger/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/AmmoPickupTest.xml

@@ -0,0 +1,294 @@
+<?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:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Scenemesh">
+      <Components>
+        <c:Model>
+          <Resource>Models/LevelBase/MapVersion1.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="DirectionalLight">
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>2</Intensity>
+        </c:DirectionalLight>
+        <c:Model>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="61.9050903" Z="0"/>
+          <Scale X="50" Y="50" Z="50"/>
+          <Orientation X="4.42700005" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="38.0347443" Y="1.88588905" Z="62.7340622"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.904668212" Y="0" Z="8.48177528"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4.61666441" Y="0" Z="-8.51156044"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-7.56803513" Y="-0.0658408776" Z="0.59418112"/>
+          <Scale X="1.20000005" Y="0.900000036" Z="1.30000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="10.460474" Y="0" Z="-3.92580295"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.09146011" Y="-0.315138876" Z="-0.333906144"/>
+          <Scale X="150" Y="1" Z="180"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BluSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-60.2567062" Y="1.60000002" Z="-78.1000061"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="2.24403"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:AmmoPickup>
+          <RespawnTimer>1</RespawnTimer>
+          <AmmoGain>22</AmmoGain>
+        </c:AmmoPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="75"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:AmmoPickup>
+          <RespawnTimer>1</RespawnTimer>
+          <AmmoGain>22</AmmoGain>
+        </c:AmmoPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="77"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:AmmoPickup>
+          <RespawnTimer>4</RespawnTimer>
+          <AmmoGain>44</AmmoGain>
+        </c:AmmoPickup>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="60" Y="1" Z="79"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/AmmunitionHUD.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="AmmunitionHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AmmunitionHUD/>
+    <c:Transform>
+      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
+      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="AmmunitionHUDBackground">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Position X="0" Y="0" Z="-0.00200000009"/>
+          <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionText">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="MagazineAmmo">
+          <Components>
+            <c:Text>
+              <Content>32</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Ammo">
+          <Components>
+            <c:Text>
+              <Content>360</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+              <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/AnimationTests2.xml

@@ -26,29 +26,25 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Wave">
+        <Entity name="Running">
           <Components>
             <c:Animation>
               <AnimationName1>Run</AnimationName1>
               <Weight1>0.5</Weight1>
-              <Time1>0.78014858943309839</Time1>
+              <Time1>0.60188997954429357</Time1>
-              <Speed1>1</Speed1>
+              <Speed1>-1</Speed1>
               <Speed2>1</Speed2>
-              <AnimationName2>StrafeRight</AnimationName2>
               <Weight2>0.5</Weight2>
-              <Time2>0.78620929522779459</Time2>
+              <Time2>0.96957233017255007</Time2>
-              <AnimationName3>ShootFastRifle</AnimationName3>
+              <Time3>0.093923612201312068</Time3>
-              <Time3>0.13809128482706701</Time3>
               <Speed3>1</Speed3>
             </c:Animation>
             <c:AnimationOffset>
               <AnimationName>AimRifle</AnimationName>
-              <Time>0.040000014007091522</Time>
+              <Time>0.5</Time>
             </c:AnimationOffset>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-              <Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
-              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
               <Position X="-0.690088332" Y="0" Z="0"/>
@@ -62,13 +58,11 @@
                   <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
                 </c:BoneAttachment>
                 <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                  <Color A="1" B="1" G="1" R="19.6078434"/>
-                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.144055843" Y="0.970111489" Z="-0.126199633"/>
+                  <Position X="0.161975682" Y="1.06281972" Z="-0.216630161"/>
-                  <Orientation X="-0.535831392" Y="0.0691146553" Z="-0.0608282126"/>
+                  <Orientation X="-0.064812161" Y="-0.0739696771" Z="0.143780142"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -78,13 +72,27 @@
         <Entity>
           <Components>
             <c:PointLight>
+              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
               <Radius>10</Radius>
             </c:PointLight>
             <c:Transform>
-              <Position X="0" Y="1.0823108" Z="0.738871336"/>
+              <Position X="-0.375567257" Y="2.13093901" Z="-0.718547285"/>
             </c:Transform>
           </Components>
-          <Children/>
+          <Children>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.70588237" R="0.70588237"/>
+                  <Radius>10</Radius>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-1.96873236" Y="0" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
         </Entity>
         <Entity>
           <Components>
@@ -97,6 +105,43 @@
           </Components>
           <Children/>
         </Entity>
+        <Entity>
+          <Components>
+            <c:Animation>
+              <AnimationName1>ShootFastRifle</AnimationName1>
+              <Time1>0.056234247235838808</Time1>
+              <Speed1>1</Speed1>
+              <Speed2>1</Speed2>
+              <AnimationName2>Idl</AnimationName2>
+              <Weight2>0.5</Weight2>
+              <Time2>1.8308673495784191</Time2>
+              <AnimationName3>StrafeRigh</AnimationName3>
+              <Weight3>0.5</Weight3>
+              <Time3>0.32167823998061529</Time3>
+              <Speed3>1</Speed3>
+            </c:Animation>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Model>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.803468645" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
       </Children>
     </Entity>
   </Children>

resources/Schema/Entities/AnimationTests3.xml

@@ -26,57 +26,48 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Wave">
+        <Entity name="Running">
           <Components>
             <c:Animation>
               <AnimationName1>Run</AnimationName1>
               <Weight1>0.5</Weight1>
-              <Time1>0.97312056690160276</Time1>
+              <Time1>0.14873348341666759</Time1>
-              <Speed1>1</Speed1>
+              <Speed1>-1</Speed1>
               <Speed2>1</Speed2>
-              <AnimationName2>ReloadSwitch</AnimationName2>
+              <AnimationName2></AnimationName2>
-              <Time2>0.91310356788604263</Time2>
+              <Weight2>0.5</Weight2>
-              <AnimationName3>LeftRight</AnimationName3>
+              <Time2>0.96957233017255007</Time2>
-              <Weight3>0</Weight3>
+              <AnimationName3></AnimationName3>
-              <Time3>0.040207288496060478</Time3>
+              <Time3>0.093923612201312068</Time3>
               <Speed3>1</Speed3>
             </c:Animation>
             <c:AnimationOffset>
-              <AnimationName>DownUp</AnimationName>
+              <AnimationName>AimRifle</AnimationName>
-              <Time>0.77999961376190186</Time>
             </c:AnimationOffset>
             <c:Model>
-              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-              <Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
-              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
-              <Position X="-0.690088332" Y="1.00491476" Z="0"/>
+              <Position X="-0.690088332" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
-            <Entity>
+            <Entity name="R_Arm_Weapon_Joint">
               <Components>
                 <c:BoneAttachment>
                   <BoneName>R_Arm_Weapon_Joint</BoneName>
+                  <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
                 </c:BoneAttachment>
                 <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.120548911" Y="-0.223148599" Z="-0.151705116"/>
+                  <Position X="0.106085993" Y="1.24281573" Z="-0.198514819"/>
-                  <Orientation X="0.09407565" Y="0.0181003436" Z="0.0279055703"/>
+                  <Orientation X="0.466044426" Y="0.284358948" Z="-0.0190349482"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
-            <Entity>
-              <Components>
-                <c:Camera/>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
         <Entity>
@@ -101,6 +92,40 @@
           </Components>
           <Children/>
         </Entity>
+        <Entity>
+          <Components>
+            <c:Animation>
+              <AnimationName1>ShootFastRifle</AnimationName1>
+              <Time1>0.11093210511546658</Time1>
+              <Speed1>1</Speed1>
+            </c:Animation>
+            <c:AnimationOffset>
+              <AnimationName>AimRifle</AnimationName>
+              <Time>1</Time>
+            </c:AnimationOffset>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Model>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0.106085993" Y="1.24281573" Z="-0.198514819"/>
+                  <Orientation X="0.466044426" Y="0.284358948" Z="-0.0190349482"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
       </Children>
     </Entity>
   </Children>

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/CapturePointHUDGroup.xml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="CapturePointHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <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>
+          <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>
+            </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>
+          <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>
+              <Percentage>0.80222018197612788</Percentage>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+            </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>
+          <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>
+            </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>
+          <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>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+            </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>
+          <Color A="0.699999988" B="0" G="0.200000003" 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>
+            </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>

resources/Schema/Entities/CapturePointHUDHexagon.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="BackgroundHexagon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Sprite>
+      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+      <Color A="0.666666687" 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/>
+        <c:Fill>
+          <Percentage>0.5</Percentage>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+        </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.5710001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/CaptureTestState5.xml

@@ -2,12 +2,246 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Transform>
+    <c:Transform/>
-      <Position X="0.340887427" Y="0" Z="0"/>
-    </c:Transform>
   </Components>
 
   <Children>
+    <Entity name="Scenemesh">
+      <Components>
+        <c:AABB>
+          <Origin X="0.195705414" Y="26.0382366" Z="-0.010017395"/>
+          <Size X="135.414337" Y="68.3848572" Z="180.020035"/>
+        </c:AABB>
+        <c:Model>
+          <Resource>Models/LevelBase/MapVersion1.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="DirectionalLight">
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>2</Intensity>
+        </c:DirectionalLight>
+        <c:Model>
+          <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="61.9050903" Z="0"/>
+          <Scale X="50" Y="50" Z="50"/>
+          <Orientation X="4.42700005" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="38.0347443" Y="1.88588905" Z="62.7340622"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.904668212" Y="0" Z="8.48177528"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4.61666441" Y="0" Z="-8.51156044"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-7.56803513" Y="-0.0658408776" Z="0.59418112"/>
+          <Scale X="1.20000005" Y="0.900000036" Z="1.30000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="10.460474" Y="0" Z="-3.92580295"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.09146011" Y="-0.315138876" Z="-0.333906144"/>
+          <Scale X="150" Y="1" Z="180"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BluSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="2.24403"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
     <Entity>
       <Components>
         <c:AABB/>
@@ -15,10 +249,12 @@
           <HomePointForTeam>
             <Red/>
           </HomePointForTeam>
+          <CaptureTimer>15</CaptureTimer>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="0" G="0.200000003" R="1"/>
+          <Color A="0.300000012" B="0" G="0" R="1"/>
+          <Transparent>true</Transparent>
         </c:Model>
         <c:Team>
           <Team>
@@ -26,7 +262,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="6.60000038" Y="0" Z="0"/>
+          <Position X="56.0000038" Y="1.50000012" Z="77.1000061"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -40,11 +276,12 @@
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="1" G="1" R="0"/>
+          <Color A="0.300000012" B="1" G="1" R="1"/>
+          <Transparent>true</Transparent>
         </c:Model>
         <c:Team/>
         <c:Transform>
-          <Position X="4.46673203" Y="0" Z="3.50259304"/>
+          <Position X="56.0000038" Y="1.70000005" Z="78.5"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -58,15 +295,12 @@
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
+          <Color A="0.300000012" B="1" G="1" R="1"/>
+          <Transparent>true</Transparent>
         </c:Model>
-        <c:Team>
+        <c:Team/>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
         <c:Transform>
-          <Position X="3.00000024" Y="0" Z="0.113596022"/>
+          <Position X="56.0000038" Y="1.10000002" Z="79.6000061"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -76,11 +310,13 @@
       <Components>
         <c:AABB/>
         <c:CapturePoint>
+          <CaptureTimer>-15</CaptureTimer>
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
+          <Color A="0.300000012" B="1" G="0" R="0"/>
+          <Transparent>true</Transparent>
         </c:Model>
         <c:Team>
           <Team>
@@ -88,7 +324,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="1.75382805" Y="0" Z="0.0895374417"/>
+          <Position X="56.0000038" Y="1.60000002" Z="80.6000061"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -101,11 +337,13 @@
           <HomePointForTeam>
             <Blue/>
           </HomePointForTeam>
+          <CaptureTimer>-15</CaptureTimer>
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
+          <Color A="0.300000012" B="1" G="0" R="0"/>
+          <Transparent>true</Transparent>
         </c:Model>
         <c:Team>
           <Team>
@@ -113,61 +351,12 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="0.56674248" Y="0" Z="0"/>
+          <Position X="56.0000038" Y="1.4000001" Z="82.1000061"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
       <Children/>
     </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Health/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-        </c:Model>
-        <c:Player/>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="4.29100037" Y="-0.08556436" Z="1.29717529"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:AABB/>
-        <c:Health/>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-        </c:Model>
-        <c:Player/>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform>
-          <Position X="5.43557501" Y="0.888866663" Z="1.55849135"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Test/DummyScene.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.600000024" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/DamageIndicator.xml

@@ -0,0 +1,22 @@
+<?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:Sprite>
+      <DiffuseTexture>Textures/DamageIndicator.png</DiffuseTexture>
+      <GlowMap></GlowMap>
+      <DepthSort>false</DepthSort>
+      <Color A="1" B="0.721568644" G="1" R="0.839215696"/>
+    </c:Sprite>
+    <c:Transform>
+      <Position X="0" Y="0" Z="-0.472000033"/>
+      <Scale X="0.100000001" Y="0.200000003" Z="0.5"/>
+    </c:Transform>
+    <c:Lifetime>
+      <Lifetime>1.5</Lifetime>
+    </c:Lifetime>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/DamageIndicatorTest.xml

@@ -0,0 +1,426 @@
+<?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:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Scenemesh">
+      <Components>
+        <c:AABB>
+          <Size X="150" Y="64" Z="180"/>
+        </c:AABB>
+        <c:Model>
+          <Resource>Models\MapVersion1.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="DirectionalLight">
+      <Components>
+        <c:DirectionalLight>
+          <Intensity>2</Intensity>
+        </c:DirectionalLight>
+        <c:Model>
+          <Resource>Models/DirectionalLightWidget.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="61.9050903" Z="0"/>
+          <Scale X="50" Y="50" Z="50"/>
+          <Orientation X="4.42700005" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0.370978802" Y="1.88588905" Z="-0.55370003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PointLight">
+      <Components>
+        <c:PointLight>
+          <Radius>8</Radius>
+          <Intensity>2.7999999523162842</Intensity>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="38.0347443" Y="1.88588905" Z="62.7340622"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.904668212" Y="0" Z="8.48177528"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-4.61666441" Y="0" Z="-8.51156044"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-7.56803513" Y="-0.0658408776" Z="0.59418112"/>
+          <Scale X="1.20000005" Y="0.900000036" Z="1.30000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="10.460474" Y="0" Z="-3.92580295"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="1.09146011" Y="-0.315138876" Z="-0.333906144"/>
+          <Scale X="150" Y="1" Z="180"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BluSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-2.05988312" Y="0" Z="2.79573512"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="1.85022807" Y="0" Z="-2.08909845"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.98651481" Y="0" Z="-4.67667246"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="-5.16323137" Y="0" Z="3.62892342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:PlayerSpawn/>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="2.24403"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="2.20245028" Y="0" Z="-1.97843659"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="4.79769945" Y="0" Z="-5.2088728"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Player">
+      <Components>
+        <c:AABB>
+          <Origin X="0" Y="0.772000015" Z="0"/>
+          <Size X="1" Y="1.60000002" Z="1"/>
+        </c:AABB>
+        <c:Collidable/>
+        <c:DashAbility/>
+        <c:Health>
+          <Health>99</Health>
+        </c:Health>
+        <c:Physics>
+          <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+        </c:Physics>
+        <c:Player>
+          <MovementSpeed>5</MovementSpeed>
+        </c:Player>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="57" Y="0.212861136" Z="77"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Camera">
+          <Components>
+            <c:Camera/>
+            <c:Transform>
+              <Position X="0" Y="1.37700009" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="PlayerName">
+              <Components>
+                <c:Text>
+                  <Resource>Fonts/DroidSans.ttf,100</Resource>
+                  <Color A="1" B="0" G="1" R="0"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+                  <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+                  <Orientation X="0" Y="3.14199996" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="CameraModel">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Camera.mesh</Resource>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
+                  <Scale X="1.30000007" Y="1.50000012" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="HUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="HealthBar">
+                  <Components>
+                    <c:Fill>
+                      <Percentage>0.99000000953674316</Percentage>
+                      <Color A="0" B="0.99000001" G="0" R="0.00999999046"/>
+                    </c:Fill>
+                    <c:HealthHUD/>
+                    <c:Model>
+                      <Resource>Models/Core/UnitHexagon.mesh</Resource>
+                      <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
+                      <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
+                      <Orientation X="0" Y="0.594000041" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Crosshair">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/CrosshairQuad.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0" Z="0.200000003"/>
+                      <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
+                      <Orientation X="1.57000005" Y="0" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Weapon">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/AssaultWeaponRed.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0.180000007" Y="-0.183000013" Z="0"/>
+                      <Orientation X="0" Y="3.08300018" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="WeaponMuzzle">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0.215000004" Y="-0.153000012" Z="-0.266000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ThirdPersonCamera">
+          <Components>
+            <c:Camera/>
+            <c:Model>
+              <Resource>Models/Camera.mesh</Resource>
+              <Visible>false</Visible>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
+              <Orientation X="5.95600033" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlayerModel">
+          <Components>
+            <c:Animation/>
+            <c:HiddenForLocalPlayer/>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
+              <Color A="1" B="0" G="0" R="1"/>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AABBStanding">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCube.mesh</Resource>
+              <Color A="0.427450985" B="1" G="1" R="1"/>
+              <Visible>false</Visible>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.772000015" Z="0"/>
+              <Scale X="1" Y="1.60000002" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AABBCrouching">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCube.mesh</Resource>
+              <Color A="0.745098054" B="1" G="0" R="1"/>
+              <Visible>false</Visible>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.772000015" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DeadGirl.xlm

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AABB>
+      <Origin X="0" Y="0.772000015" Z="0"/>
+      <Size X="1" Y="1.60000002" Z="1"/>
+    </c:AABB>
+    <c:AssaultWeapon>
+      <RPM>600</RPM>
+    </c:AssaultWeapon>
+    <c:Collidable/>
+    <c:DashAbility/>
+    <c:Health/>
+    <c:Physics>
+      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+    </c:Physics>
+    <c:Player>
+      <MovementSpeed>5</MovementSpeed>
+    </c:Player>
+    <c:Team>
+      <Team>
+        <Red/>
+      </Team>
+    </c:Team>
+    <c:Transform>
+      <Position X="0" Y="0.0288832653" Z="2.64837074"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Camera">
+      <Components>
+        <c:Camera/>
+        <c:Transform>
+          <Position X="0" Y="1.27700007" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlayerName">
+          <Components>
+            <c:Text>
+              <Resource>Fonts/DroidSans.ttf,100</Resource>
+              <Color A="1" B="0" G="1" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+              <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+              <Orientation X="0" Y="3.14199996" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="CameraModel">
+          <Components>
+            <c:Model>
+              <Resource>Models/Widgets/Camera.mesh</Resource>
+              <Visible>false</Visible>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
+              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="HUD">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="HealthBar">
+              <Components>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0" B="1" G="0" R="0"/>
+                </c:Fill>
+                <c:HealthHUD/>
+                <c:Model>
+                  <Resource>Models/Core/UnitHexagon.mesh</Resource>
+                  <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
+                  <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
+                  <Orientation X="0" Y="0.594000041" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Crosshair">
+              <Components>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
+                  <DepthSort>false</DepthSort>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.200000003"/>
+                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Hands">
+          <Components>
+            <c:Animation>
+              <AnimationName1>Idle</AnimationName1>
+              <Time1>0.28963486380924053</Time1>
+              <Speed1>1</Speed1>
+            </c:Animation>
+            <c:Model>
+              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="WeaponModel">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Model>
+                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                  <Transparent>true</Transparent>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0.120430455" Y="-0.231800437" Z="-0.181454748"/>
+                  <Orientation X="0.0104047749" Y="-0.00268166233" Z="0.042844031"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="WeaponMuzzle">
+                  <Components>
+                    <c:Spawner>
+                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+                    </c:Spawner>
+                    <c:Transform>
+                      <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="FirstPersonReloadSpawner">
+              <Components>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/WeaponReloadEffect.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="ThirdPersonCamera">
+      <Components>
+        <c:Camera/>
+        <c:Model>
+          <Resource>Models/Widgets/Camera.mesh</Resource>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
+          <Orientation X="5.95600033" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="PlayerModel">
+      <Components>
+        <c:Animation>
+          <AnimationName1>Idle</AnimationName1>
+          <Time1>0.42156525436696768</Time1>
+          <Speed1>1</Speed1>
+        </c:Animation>
+        <c:AnimationOffset>
+          <AnimationName>AimRifle</AnimationName>
+          <Time>0.5</Time>
+        </c:AnimationOffset>
+        <c:HiddenForLocalPlayer/>
+        <c:Model>
+          <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="ThirdPersonWeaponModel">
+          <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
+            <c:Model>
+              <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+              <Visible>false</Visible>
+            </c:Model>
+            <c:Transform>
+              <Position X="0.160716802" Y="1.02800739" Z="-0.215931982"/>
+              <Orientation X="-0.0627654716" Y="-0.0450839326" Z="0.119217664"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ThirdPersonWeaponMuzzle">
+              <Components>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform>
+                  <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AABBStanding">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="0.427450985" B="1" G="1" R="1"/>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0.772000015" Z="0"/>
+          <Scale X="1" Y="1.60000002" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AABBCrouching">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="0.745098054" B="1" G="0" R="1"/>
+          <Visible>false</Visible>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0.772000015" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DoubleJumpHexagon.xml

@@ -2,27 +2,26 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Model>
-      <Resource>Models/Effects/JumpEffectHexagon.mesh</Resource>
-      <Color A="0.576470613" B="500" G="255" R="0.854901969"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.600000024" Y="0.800000012" Z="0"/>
-      <Scale X="0.50000012" Y="0.50000019" Z="0.50000014"/>
-    </c:Transform>
     <c:Lifetime>
       <Lifetime>0.5</Lifetime>
     </c:Lifetime>
     <c:ExplosionEffect>
       <ColorByDistance>true</ColorByDistance>
-      <Velocity X="0" Y="-7.76300049" Z="0"/>
+      <Velocity X="3.60000014" Y="3.93700027" Z="0"/>
-      <ExplosionOrigin X="0" Y="2.67900002" Z="0"/>
       <ExponentialAccelaration>true</ExponentialAccelaration>
       <ExplosionDuration>0.5</ExplosionDuration>
-      <EndColor A="0" B="0" G="0" R="1"/>
+      <EndColor A="0" B="1" G="1" R="1"/>
       <Randomness>true</Randomness>
     </c:ExplosionEffect>
+    <c:Model>
+      <Resource>Models/Effects/JumpEffectHexagon.mesh</Resource>
+      <Color A="0.545098066" B="500" G="255" R="0.854901969"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.600000024" Y="0.800000012" Z="0"/>
+      <Scale X="0.500000119" Y="0.500000179" Z="0.500000119"/>
+    </c:Transform>
   </Components>
 
   <Children/>

resources/Schema/Entities/HealthHUD.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="HealthText">
+      <Components>
+        <c:Fill>
+          <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.392156869" B="1" G="0" R="0"/>
+        </c:Text>
+        <c:Transform>
+          <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
+          <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+          <Orientation X="0" Y="0.410000026" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthBar">
+      <Components>
+        <c:Fill>
+          <Percentage>1</Percentage>
+          <Color A="0.196078435" B="1" G="0" R="0"/>
+        </c:Fill>
+        <c:Sprite>
+          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+          <Color A="0.588235319" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:HealthHUD/>
+        <c:Transform>
+          <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+          <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+          <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthPickup.xml

@@ -5,10 +5,15 @@
     <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
     </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/HitMarker.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HitMarker" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.1</Lifetime>
+    </c:Lifetime>
+    <c:Sprite>
+      <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
+      <DepthSort>false</DepthSort>
+    </c:Sprite>
+    <c:Transform>
+      <Scale X="0.031" Y="0.031" Z="1"/>
+      <Orientation X="0" Y="0" Z="0.782"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>