asnfjksdll

include/Engine/Collision/Collision.h

@@ -20,9 +20,6 @@
 class World;
 struct ComponentWrapper;
 
-template<typename T>
-class Octree;
-
 namespace Collision
 {
 //Return true if the ray hits the box.
@@ -47,24 +44,21 @@ bool RayVsTriangle(const Ray& ray,
     float& outVCoord,
     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 RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix);
+bool RayVsModel(const Ray& ray, 
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices);
 //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 RawModel::Vertex* modelVertices,
+    const std::vector<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 RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
     float& outDistance,
     float& outUCoord,
     float& outVCoord);
@@ -87,13 +81,6 @@ 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

@@ -1,18 +0,0 @@
-#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
 {
-    EntityWrapper Inflictor;
-    EntityWrapper Victim;
+    //NOTE: this struct is missing information on what the damageSource is
+    EntityWrapper Player;
     double Damage;
 };
 

include/Engine/Core/EShoot.h

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

include/Engine/Core/Octree.h

@@ -41,8 +41,6 @@ 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.
@@ -102,8 +100,6 @@ 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;
@@ -123,15 +119,6 @@ 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>
@@ -177,13 +164,6 @@ 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()
 {
@@ -302,59 +282,4 @@ 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/Input/FirstPersonInputController.h

@@ -55,7 +55,6 @@ protected:
     //specialabilitys
     bool m_MovementKeyDown = false;
     bool m_SpecialAbilityKeyDown = false;
-    int m_NumberOfMovementKeysDown = 0;
 
     EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
     bool OnLockMouse(const Events::LockMouse& e);
@@ -133,7 +132,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
         //if value = 0 then you have just released this key
         if (e.Value != 0) {
-            m_NumberOfMovementKeysDown++;
             m_MovementKeyDown = true;
             //if you pressed the same key within m_AssaultDashDoubleTapSensitivityTimer then you have doubletapped it
             if (m_AssaultDashDoubleTapDeltaTime < m_AssaultDashDoubleTapSensitivityTimer && m_AssaultDashTapDirection == m_CurrentDirectionVector) {
@@ -141,14 +139,10 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             }
         } else {
             //== 0
-            m_NumberOfMovementKeysDown--;
-            if (m_NumberOfMovementKeysDown == 0) {
-                m_MovementKeyDown = false;
-            }
-                //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
-                m_AssaultDashTapDirection = m_CurrentDirectionVector;
-                m_AssaultDashDoubleTapDeltaTime = 0.f;
-            
+            m_MovementKeyDown = false;
+            //you have just released the key, store what key it was and reset the doubletap-sensitivity-timer
+            m_AssaultDashTapDirection = m_CurrentDirectionVector;
+            m_AssaultDashDoubleTapDeltaTime = 0.f;
         }
     }
 
@@ -208,6 +202,12 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+        //moving to the side has priority
+        return;
+    }
+
+    //dashing with doubletap - check if doubletap to dash enabled
+    if (ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
         return;
     }
 
@@ -216,11 +216,6 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         m_AssaultDashDoubleTapped = false;
     }
 
-    //dashing with doubletap - check if doubletap to dash enabled
-    if (!ResourceManager::Load<ConfigFile>("Input.ini")->Get<bool>("Keyboard.DoubleTapToDash", false)) {
-        return;
-    }
-
     //check if we have received a valid doubletap
     if (!m_ValidDoubleTap) {
         return;

include/Engine/Network/Client.h

@@ -13,8 +13,6 @@
 #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"
@@ -35,15 +33,17 @@ public:
     void Connect(std::string address, int port);
     void Update() override;
 
-    std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
-    void parseSpawnEvents();
-    // Save for children
+private:
     std::unique_ptr<SnapshotFilter> m_SnapshotFilter = nullptr;
 
-    std::string m_Address;
-    int m_Port = 0;
+    // Assio UDP logic
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
+    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,14 +72,16 @@ public:
     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 parseUDPConnect(Packet& packet);
-    void parseTCPConnect(Packet& packet);
+    void parseConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
     void parseKick();
@@ -89,7 +91,7 @@ public:
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
-    void hasServerTimedOut();
+    bool hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     void sendLocalPlayerTransform();
@@ -109,10 +111,6 @@ public:
     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

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

include/Engine/Network/HybridServer.h

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

include/Engine/Network/MessageType.h

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

include/Engine/Network/Network.h

@@ -12,7 +12,7 @@
 #include <fstream>
 #include <iostream>
 
-#define BUFFERSIZE 32000
+#define INPUTSIZE 32000
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
 
@@ -35,8 +35,6 @@ 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

@@ -1,21 +0,0 @@
-#ifndef NetworkClient_h__
-#define NetworkClient_h__
-
-#include "Network/Packet.h"
-#define BUFFERSIZE 32000
-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

@@ -1,21 +0,0 @@
-#ifndef NetworkServer_h__
-#define NetworkServer_h__
-#include <boost/asio.hpp>
-#include "Network/Packet.h"
-#include "Network/PlayerDefinition.h"
-#define BUFFERSIZE 32000
-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,15 +49,10 @@ 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; }
@@ -69,7 +64,6 @@ private:
     size_t m_MaxPacketSize = 512;
     size_t m_HeaderSize = 0;
     void resizeData();
-    void resizeData(int size);
 };
 
 #endif

include/Engine/Network/PlayerDefinition.h

@@ -2,7 +2,6 @@
 #define PlayerDefinition_h__
 #include <string>
 #include "../Core/Entity.h"
-#include <boost/asio.hpp>
 
 struct PlayerDefinition {
     ::EntityID EntityID = EntityID_Invalid;
@@ -10,10 +9,6 @@ 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,9 +5,8 @@
 #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"
@@ -29,29 +28,28 @@ 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[BUFFERSIZE] = { 0 };
+    char readBuffer[INPUTSIZE] = { 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;
     
@@ -60,9 +58,11 @@ private:
     PacketID m_PreviousPacketID = 0;
 
     // Private member functions
-    //int  receive(char* data);
-    void reliableBroadcast(Packet& packet);
-    void unreliableBroadcast(Packet& packet);
+    size_t receive(char* data);
+    void readFromClients();
+    void send(PlayerID player, Packet& packet);
+    void send(Packet& packet);
+    void broadcast(Packet& packet);
     void sendSnapshot();
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
@@ -70,19 +70,15 @@ 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();
-    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);
-
+    PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
@@ -92,8 +88,7 @@ private:
     bool OnEntityDeleted(const Events::EntityDeleted& e);
     EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
-    EventRelay<Server, Events::PlayerDamage> m_EPlayerDamage;
-    bool OnPlayerDamage(const Events::PlayerDamage& e);
+    void parsePlayerTransform(Packet& packet);
 };
 
 #endif

include/Engine/Network/TCPClient.h

@@ -1,28 +0,0 @@
-#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

@@ -1,31 +0,0 @@
-#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

@@ -1,27 +0,0 @@
-#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

@@ -1,25 +0,0 @@
-#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/ModelJob.h

@@ -120,32 +120,6 @@ 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;
-                }
-            }
         }
             
     };
@@ -166,8 +140,8 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
+   // const ::Skeleton::Animation* Animation = nullptr;
+
     
 
 

include/Engine/Rendering/PickingPass.h

@@ -59,6 +59,8 @@ private:
 
     int m_ColorCounter[2];
     std::map<std::tuple<EntityID, const World*, Camera*>, glm::ivec2> m_EntityColors;
+
+    Texture* m_WhiteTexture;
 };
 
 #endif 

include/Engine/Rendering/RenderSystem.h

@@ -18,7 +18,6 @@
 #include "../Core/EPlayerSpawned.h"
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
-#include "../Core/ConfigFile.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -49,9 +48,6 @@ private:
     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/Skeleton.h

@@ -100,29 +100,50 @@ public:
 
 	int GetBoneID(std::string name);
 
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
+    void CalculateFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
+    void CalculateFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
 
     const Animation* GetAnimation(std::string name);
 
-    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, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
+    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, const Bone* bone, glm::mat4 parentMatrix);
+    void  AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, 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/Game/MiniDump.h

@@ -1,8 +0,0 @@
-#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

@@ -1,32 +0,0 @@
-#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

@@ -1,17 +0,0 @@
-#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/CapturePointSystem.h

@@ -44,6 +44,7 @@ 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

@@ -1,33 +0,0 @@
-#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/HealthSystem.h

@@ -9,8 +9,6 @@
 #include "Core/EPlayerDamage.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
-#include "Core/ConfigFile.h"
-#include "Input/EInputCommand.h"
 
 #include <tuple>
 #include <vector>
@@ -25,19 +23,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;
-
+   
 };
 
 #endif

include/Game/Systems/KillFeedSystem.h

@@ -1,39 +0,0 @@
-#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/PlayerHUDSystem.h

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

include/Game/Systems/PlayerMovementSystem.h

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

include/Game/Systems/PlayerSpawnSystem.h

@@ -13,8 +13,6 @@ public:
     PlayerSpawnSystem(SystemParams params);
 
     virtual void Update(double dt) override;
-    
-    static void SetRespawnTime(float respawnTime) { m_RespawnTime = respawnTime; };
 
 private:
     struct SpawnRequest
@@ -25,19 +23,10 @@ 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(Events::InputCommand& e);
+    bool OnInputCommand(const 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

@@ -1,49 +0,0 @@
-#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

@@ -1,34 +0,0 @@
-#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

@@ -1,44 +0,0 @@
-#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

@@ -0,0 +1,192 @@
+#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,9 +4,6 @@ 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
@@ -23,7 +20,7 @@ StartNetwork=false
 IsServer=false
 Name=Bob
 Address=127.0.0.1
-Port=27666
+Port=13
 MaxConnections=8
 SnapshotInterval=0.05
 SendInputIntervalMs=33

resources/DefaultInput.ini

@@ -2,9 +2,6 @@
 Sensitivity=0.5
 InvertPitch=false
 
-[Keyboard]
-DoubleTapToDash=false
-
 [Bindings]
 MouseLeft=PrimaryFire
 MouseX=Yaw
@@ -24,5 +21,4 @@ F1=ToggleEditor
 C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient
-P=SwitchToPlayer
-K=TakeDamage,1500
+P=SwitchToPlayer

resources/Schema/Components.xsd

@@ -32,7 +32,6 @@
 	<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/AssaultWeapon.xsd"/>
@@ -40,6 +39,4 @@
 	<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

@@ -1,5 +0,0 @@
-<?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

@@ -1,21 +0,0 @@
-<?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

@@ -1,3 +0,0 @@
-<?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

@@ -1,10 +0,0 @@
-<?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,6 +6,4 @@
 	<MaxAmmo>360</MaxAmmo>
 	<BaseDamage>5</BaseDamage>
 	<RPM>120</RPM>
-	<ViewPunch>0.01</ViewPunch>
-	<ReloadTime>2</ReloadTime>
 </AssaultWeapon>

resources/Schema/Components/AssaultWeapon.xsd

@@ -22,12 +22,6 @@
 				<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/CapturePoint.xml

@@ -2,6 +2,5 @@
 <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,11 +20,7 @@
 						<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/KillFeed.xml

@@ -1,3 +0,0 @@
-<?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

@@ -1,9 +0,0 @@
-<?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,5 +2,4 @@
 <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,13 +5,12 @@
 
 	<xs:element name="Player">
 		<xs:annotation>
-			<xs:documentation>The player entity</xs:documentation>
+			<xs:documentation>The player charachter</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/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></Content>
+	<Content>Text</Content>
 	<Resource></Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>

resources/Schema/Entities/AmmoHUD

@@ -1,98 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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/Core/UnitSphere.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="0" Y="1" Z="0"/>
-    </c:Transform>
-    <c:Trigger/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/AmmoPickupTest.xml

@@ -1,294 +0,0 @@
-<?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

@@ -1,62 +0,0 @@
-<?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,25 +26,29 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Running">
+        <Entity name="Wave">
           <Components>
             <c:Animation>
               <AnimationName1>Run</AnimationName1>
               <Weight1>0.5</Weight1>
-              <Time1>0.60188997954429357</Time1>
-              <Speed1>-1</Speed1>
+              <Time1>0.78014858943309839</Time1>
+              <Speed1>1</Speed1>
               <Speed2>1</Speed2>
+              <AnimationName2>StrafeRight</AnimationName2>
               <Weight2>0.5</Weight2>
-              <Time2>0.96957233017255007</Time2>
-              <Time3>0.093923612201312068</Time3>
+              <Time2>0.78620929522779459</Time2>
+              <AnimationName3>ShootFastRifle</AnimationName3>
+              <Time3>0.13809128482706701</Time3>
               <Speed3>1</Speed3>
             </c:Animation>
             <c:AnimationOffset>
               <AnimationName>AimRifle</AnimationName>
-              <Time>0.5</Time>
+              <Time>0.040000014007091522</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"/>
@@ -58,11 +62,13 @@
                   <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
                 </c:BoneAttachment>
                 <c:Model>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+                  <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
+                  <Color A="1" B="1" G="1" R="19.6078434"/>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.161975682" Y="1.06281972" Z="-0.216630161"/>
-                  <Orientation X="-0.064812161" Y="-0.0739696771" Z="0.143780142"/>
+                  <Position X="0.144055843" Y="0.970111489" Z="-0.126199633"/>
+                  <Orientation X="-0.535831392" Y="0.0691146553" Z="-0.0608282126"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -72,27 +78,13 @@
         <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.375567257" Y="2.13093901" Z="-0.718547285"/>
+              <Position X="0" Y="1.0823108" Z="0.738871336"/>
             </c:Transform>
           </Components>
-          <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>
+          <Children/>
         </Entity>
         <Entity>
           <Components>
@@ -105,43 +97,6 @@
           </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,48 +26,57 @@
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Running">
+        <Entity name="Wave">
           <Components>
             <c:Animation>
               <AnimationName1>Run</AnimationName1>
               <Weight1>0.5</Weight1>
-              <Time1>0.14873348341666759</Time1>
-              <Speed1>-1</Speed1>
+              <Time1>0.97312056690160276</Time1>
+              <Speed1>1</Speed1>
               <Speed2>1</Speed2>
-              <AnimationName2></AnimationName2>
-              <Weight2>0.5</Weight2>
-              <Time2>0.96957233017255007</Time2>
-              <AnimationName3></AnimationName3>
-              <Time3>0.093923612201312068</Time3>
+              <AnimationName2>ReloadSwitch</AnimationName2>
+              <Time2>0.91310356788604263</Time2>
+              <AnimationName3>LeftRight</AnimationName3>
+              <Weight3>0</Weight3>
+              <Time3>0.040207288496060478</Time3>
               <Speed3>1</Speed3>
             </c:Animation>
             <c:AnimationOffset>
-              <AnimationName>AimRifle</AnimationName>
+              <AnimationName>DownUp</AnimationName>
+              <Time>0.77999961376190186</Time>
             </c:AnimationOffset>
             <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
+              <Resource>Models/Characters/Assault/FirstPerson.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"/>
+              <Position X="-0.690088332" Y="1.00491476" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
-            <Entity name="R_Arm_Weapon_Joint">
+            <Entity>
               <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/Red/AssaultWeaponRed.mesh</Resource>
+                  <Resource>Models/Weapons/Blue/AssaultWeapon.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"/>
+                  <Position X="0.120548911" Y="-0.223148599" Z="-0.151705116"/>
+                  <Orientation X="0.09407565" Y="0.0181003436" Z="0.0279055703"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity>
+              <Components>
+                <c:Camera/>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
           </Children>
         </Entity>
         <Entity>
@@ -92,40 +101,6 @@
           </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/CapturePointHUDGroup

@@ -1,10 +1,9 @@
 <?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">
+<Entity name="HudOrigin" 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"/>
+      <Position X="-24.3529072" Y="0" Z="6.95243597"/>
     </c:Transform>
   </Components>
 

resources/Schema/Entities/CaptureTestState5.xml

@@ -2,246 +2,12 @@
 <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/>
@@ -249,12 +15,10 @@
           <HomePointForTeam>
             <Red/>
           </HomePointForTeam>
-          <CaptureTimer>15</CaptureTimer>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="0.300000012" B="0" G="0" R="1"/>
-          <Transparent>true</Transparent>
+          <Color A="1" B="0" G="0.200000003" R="1"/>
         </c:Model>
         <c:Team>
           <Team>
@@ -262,7 +26,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="56.0000038" Y="1.50000012" Z="77.1000061"/>
+          <Position X="6.60000038" Y="0" Z="0"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -276,12 +40,11 @@
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-          <Transparent>true</Transparent>
+          <Color A="1" B="1" G="1" R="0"/>
         </c:Model>
         <c:Team/>
         <c:Transform>
-          <Position X="56.0000038" Y="1.70000005" Z="78.5"/>
+          <Position X="4.46673203" Y="0" Z="3.50259304"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -295,12 +58,15 @@
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-          <Transparent>true</Transparent>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
-        <c:Team/>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
         <c:Transform>
-          <Position X="56.0000038" Y="1.10000002" Z="79.6000061"/>
+          <Position X="3.00000024" Y="0" Z="0.113596022"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -310,13 +76,11 @@
       <Components>
         <c:AABB/>
         <c:CapturePoint>
-          <CaptureTimer>-15</CaptureTimer>
           <CapturePointNumber>3</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="0.300000012" B="1" G="0" R="0"/>
-          <Transparent>true</Transparent>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
           <Team>
@@ -324,7 +88,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="56.0000038" Y="1.60000002" Z="80.6000061"/>
+          <Position X="1.75382805" Y="0" Z="0.0895374417"/>
         </c:Transform>
         <c:Trigger/>
       </Components>
@@ -337,13 +101,11 @@
           <HomePointForTeam>
             <Blue/>
           </HomePointForTeam>
-          <CaptureTimer>-15</CaptureTimer>
           <CapturePointNumber>4</CapturePointNumber>
         </c:CapturePoint>
         <c:Model>
           <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Color A="0.300000012" B="1" G="0" R="0"/>
-          <Transparent>true</Transparent>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
         </c:Model>
         <c:Team>
           <Team>
@@ -351,12 +113,61 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="56.0000038" Y="1.4000001" Z="82.1000061"/>
+          <Position X="0.56674248" Y="0" Z="0"/>
         </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

@@ -1,22 +0,0 @@
-<?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

@@ -1,426 +0,0 @@
-<?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

@@ -1,255 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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:Lifetime>
-      <Lifetime>0.5</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="3.60000014" Y="3.93700027" Z="0"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <ExplosionDuration>0.5</ExplosionDuration>
-      <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/>
-
-</Entity>

resources/Schema/Entities/HealthHUD.xml

@@ -1,50 +0,0 @@
-<?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/HitMarker.xml

@@ -1,20 +0,0 @@
-<?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>

resources/Schema/Entities/MovementTest.xml

@@ -124,14 +124,10 @@
           <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:Model/>
         <c:Physics>
-          <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+          <Gravity>false</Gravity>
         </c:Physics>
         <c:Player>
           <MovementSpeed>5</MovementSpeed>
@@ -142,7 +138,8 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="0" Y="0.0288832653" Z="2.64837074"/>
+          <Position X="-1.68112314" Y="0.0288829971" Z="3.06287026"/>
+          <Orientation X="0" Y="2.14675093" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -150,7 +147,7 @@
           <Components>
             <c:Camera/>
             <c:Transform>
-              <Position X="0" Y="1.27700007" Z="0"/>
+              <Position X="0" Y="1.37700009" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -159,9 +156,10 @@
                 <c:Text>
                   <Resource>Fonts/DroidSans.ttf,100</Resource>
                   <Color A="1" B="0" G="1" R="0"/>
+                  <Visible>false</Visible>
                 </c:Text>
                 <c:Transform>
-                  <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+                  <Position X="0" Y="0.247910097" Z="-0.447844714"/>
                   <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
                   <Orientation X="0" Y="3.14199996" Z="0"/>
                 </c:Transform>
@@ -172,7 +170,6 @@
               <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"/>
@@ -181,100 +178,6 @@
               </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>1.9569972344146196</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.120748013" Y="-0.228470564" Z="-0.151475638"/>
-                      <Orientation X="0.010404693" Y="-0.00268176314" Z="0.0428441502"/>
-                    </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">
@@ -293,52 +196,15 @@
         </Entity>
         <Entity name="PlayerModel">
           <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8055945618467364</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>
+              <Resource>Models/Characters/Assault/AssaultHeadless.mesh</Resource>
               <Color A="1" B="0" G="0" R="1"/>
             </c:Model>
-            <c:Transform/>
+            <c:Transform>
+              <Orientation X="0" Y="3.14159274" Z="0"/>
+            </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.158578917" Y="1.02878916" Z="-0.215411991"/>
-                  <Orientation X="-0.0626687407" Y="-0.0361274257" Z="0.120101407"/>
-                </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>
+          <Children/>
         </Entity>
         <Entity name="AABBStanding">
           <Components>

resources/Schema/Entities/Player.xml

@@ -23,9 +23,7 @@
         <Blue/>
       </Team>
     </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832653" Z="0"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -71,306 +69,49 @@
             </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:Model>
+                  <Resource>Models/Weapons/CrosshairQuad.mesh</Resource>
+                </c:Model>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
+                  <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
+                  <Orientation X="1.57000005" Y="0" Z="0"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <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.505882382" B="3.92156863" G="1.17647064" 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.301960796" 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>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <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>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
           </Children>
         </Entity>
         <Entity name="Hands">
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.6050530664521858</Time1>
+              <Time1>0.52743271827223559</Time1>
               <Speed1>1</Speed1>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.309803933" R="0"/>
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform/>
@@ -383,11 +124,10 @@
                 </c:BoneAttachment>
                 <c:Model>
                   <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.12043035" Y="-0.234149337" Z="-0.181454644"/>
-                  <Orientation X="0.0104045281" Y="-0.00268131681" Z="0.0428438708"/>
+                  <Position X="0.120747946" Y="-0.232330009" Z="-0.151475713"/>
+                  <Orientation X="0.0104046576" Y="-0.00268170447" Z="0.0428439789"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -402,73 +142,6 @@
                   </Components>
                   <Children/>
                 </Entity>
-                <Entity name="FirstPersonReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AmmunitionHUD">
-                  <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>
               </Children>
             </Entity>
           </Children>
@@ -493,7 +166,7 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>1.620305457513453</Time1>
+          <Time1>0.69666320633760392</Time1>
           <Speed1>1</Speed1>
         </c:Animation>
         <c:AnimationOffset>
@@ -504,7 +177,6 @@
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
           <Color A="1" B="1" G="0.309803933" R="0"/>
-          <Visible>false</Visible>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -518,8 +190,8 @@
               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.160351232" Y="1.02591991" Z="-0.215102971"/>
-              <Orientation X="-0.0627480298" Y="-0.0432248674" Z="0.119431816"/>
+              <Position X="0.162715688" Y="1.02479136" Z="-0.215626657"/>
+              <Orientation X="-0.0629899353" Y="-0.0542047173" Z="0.11849726"/>
             </c:Transform>
           </Components>
           <Children>
@@ -534,15 +206,6 @@
               </Components>
               <Children/>
             </Entity>
-            <Entity name="ThirdPersonReloadSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
       </Children>

resources/Schema/Entities/PlayerDeathExplosionWithCamera.xml

@@ -2,7 +2,9 @@
 <Entity name="Explosion" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Animation/>
+    <c:Animation>
+      <Name>Hold Pos</Name>
+    </c:Animation>
     <c:Lifetime>
       <Lifetime>2.5</Lifetime>
     </c:Lifetime>

resources/Schema/Entities/PlayerRed.xml

@@ -1,576 +0,0 @@
-<?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/>
-  </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="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>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <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.505882382" B="3.92156863" G="1.17647064" 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.301960796" 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>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <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>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.6050530664521858</Time1>
-              <Speed1>1</Speed1>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
-              <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/Red/AssaultWeaponRed.mesh</Resource>
-                  <Transparent>true</Transparent>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.12043035" Y="-0.234149337" Z="-0.181454644"/>
-                  <Orientation X="0.0104045281" Y="-0.00268131681" Z="0.0428438708"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="WeaponMuzzle">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform>
-                      <Position X="0.00325386273" Y="0.0970000029" Z="-0.843000054"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="FirstPersonReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectViewRed.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AmmunitionHUD">
-                  <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>
-              </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>1.620305457513453</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/Red/AssaultWeaponRed.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.160351232" Y="1.02591991" Z="-0.215102971"/>
-              <Orientation X="-0.0627480298" Y="-0.0432248674" Z="0.119431816"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ThirdPersonWeaponMuzzle">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="ThirdPersonReloadSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/ReloadEffectWorldRed.xml</EntityFile>
-                </c:Spawner>
-                <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/RayRed.xml

@@ -6,12 +6,12 @@
       <Lifetime>0.25</Lifetime>
     </c:Lifetime>
     <c:Model>
-      <Resource>Models/Effects/CylinderShot.mesh</Resource>
-      <Color A="0.149019614" B="0" G="0" R="39.2156868"/>
+      <Resource>Models/Weapons/CylinderBullet.mesh</Resource>
+      <Color A="0.156862751" B="0" G="0.525490224" R="39.2156868"/>
       <Transparent>true</Transparent>
     </c:Model>
     <c:Transform>
-      <Scale X="0.0690000057" Y="0.0690000057" Z="100"/>
+      <Scale X="0.0110000009" Y="0.029000001" Z="100"/>
     </c:Transform>
   </Components>
 

resources/Schema/Entities/ReloadEffectView.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>2</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="3.33300018" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="1"/>
-      <Randomness>true</Randomness>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/ReloadEffectViewRed.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>2</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="3.33300018" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="1" G="1" R="19.6078434"/>
-      <Randomness>true</Randomness>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/ReloadEffectWorld.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>2</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="1.63300014" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="0"/>
-      <Randomness>true</Randomness>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/ReloadEffectWorldRed.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="WeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>2</Lifetime>
-    </c:Lifetime>
-    <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
-      <Velocity X="1.63300014" Y="0.0320000015" Z="0"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="1" G="1" R="19.6078434"/>
-      <Randomness>true</Randomness>
-    </c:ExplosionEffect>
-    <c:Model>
-      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/StoneWall.xml

@@ -1,147 +0,0 @@
-<?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:Collidable/>
-    <c:Model>
-      <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="47.681942" Y="0.14480646" Z="46.8966408"/>
-      <Scale X="2" Y="2" Z="2"/>
-      <Orientation X="5.9380002" Y="0" Z="0.35800001"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="1.10786498" Y="-0.615343928" Z="-0.37226662"/>
-          <Orientation X="0.443000019" Y="0.685000062" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="2.15796614" Y="-1.18461192" Z="-0.382025093"/>
-          <Orientation X="0" Y="2.18400002" Z="5.72200012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="3.53984666" Y="-1.55501318" Z="-0.237787247"/>
-          <Orientation X="0.604000032" Y="0.640000045" Z="6.28300047"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-2.86977816" Y="0.0265773162" Z="0.530605257"/>
-          <Orientation X="0" Y="4.71200037" Z="5.89000034"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-4.06748295" Y="1.2850678" Z="1.0140655"/>
-          <Orientation X="0" Y="4.94500017" Z="5.66600037"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-1.6440227" Y="-0.104511783" Z="0.248545036"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="3.22254896" Y="-0.99158901" Z="-1.59910381"/>
-          <Orientation X="0.268000007" Y="5.9920001" Z="6.00300026"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-3.07137322" Y="0.124666147" Z="1.97699928"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-4.24249363" Y="0.303708076" Z="1.92021227"/>
-          <Orientation X="0" Y="2.95000005" Z="5.79700041"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <Resource>Models/Props/Stones/MediumStone1.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="-1.89417958" Y="-0.57703048" Z="0.874724686"/>
-          <Orientation X="0.345000029" Y="0.651000023" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/temp

@@ -1,38 +0,0 @@
-<?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="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>

resources/Schema/Types/Entity.xsd

@@ -43,10 +43,6 @@
 							<xs:element ref="c:Shield" minOccurs="0"/>
 							<xs:element ref="c:Shielded" minOccurs="0"/>
 							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>
-							<xs:element ref="c:AmmunitionHUD" minOccurs="0"/>
-							<xs:element ref="c:KillFeed" minOccurs="0"/>
-							<xs:element ref="c:Sprite" minOccurs="0"/>
-							<xs:element ref="c:AnimationOffset" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -1,245 +0,0 @@
-#version 430
-
-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
-uniform vec2 ScreenDimensions;
-uniform float FillPercentage;
-uniform vec4 DiffuseColor;
-uniform vec4 FillColor;
-uniform vec4 Color;
-uniform vec4 AmbientColor;
-
-//Get bineded at the same time as the textures
-uniform vec2 DiffuseUVRepeat1;
-uniform vec2 DiffuseUVRepeat2;
-uniform vec2 DiffuseUVRepeat3;
-uniform vec2 NormalUVRepeat1;
-uniform vec2 NormalUVRepeat2;
-uniform vec2 NormalUVRepeat3;
-uniform vec2 SpecularUVRepeat1;
-uniform vec2 SpecularUVRepeat2;
-uniform vec2 SpecularUVRepeat3;
-uniform vec2 GlowUVRepeat1;
-uniform vec2 GlowUVRepeat2;
-uniform vec2 GlowUVRepeat3;
-layout (binding = 0) uniform sampler2D SplatMapTexture;
-layout (binding = 1) uniform sampler2D DiffuseTexture1;
-layout (binding = 2) uniform sampler2D DiffuseTexture2;
-layout (binding = 3) uniform sampler2D DiffuseTexture3;
-layout (binding = 4) uniform sampler2D NormalMapTexture1;
-layout (binding = 5) uniform sampler2D NormalMapTexture2;
-layout (binding = 6) uniform sampler2D NormalMapTexture3;
-layout (binding = 7) uniform sampler2D SpecularMapTexture1;
-layout (binding = 8) uniform sampler2D SpecularMapTexture2;
-layout (binding = 9) uniform sampler2D SpecularMapTexture3;
-layout (binding = 10) uniform sampler2D GlowMapTexture1;
-layout (binding = 11) uniform sampler2D GlowMapTexture2;
-layout (binding = 12) uniform sampler2D GlowMapTexture3;
-
-#define TILE_SIZE 16
-
-struct LightSource {
-	vec4 Position;
-	vec4 Direction;
-	vec4 Color;
-	float Radius;
-	float Intensity;
-	float Falloff;
-	int Type;
-};
-
-layout (std430, binding = 1) buffer LightBuffer
-{
-	LightSource List[];
-} LightSources;
-
-struct LightGrid {
-	float Start;
-	float Amount;
-	vec2 Padding;
-};
-
-layout (std430, binding = 2) buffer LightGridBuffer
-{
-	LightGrid Data[];
-} LightGrids;
-
-layout (std430, binding = 4) buffer LightIndexBuffer
-{
-	float LightIndex[];
-};
-
-
-in VertexData{
-	vec3 Position;
-	vec3 Normal;
-	vec3 Tangent;
-	vec3 BiTangent;
-	vec2 TextureCoordinate;
-	vec4 ExplosionColor;
-	float ExplosionPercentageElapsed;
-}Input;
-
-out vec4 sceneColor;
-out vec4 bloomColor;
-
-struct LightResult {
-	vec4 Diffuse;
-	vec4 Specular;
-};
-
-float CalcAttenuation(float radius, float dist, float falloff) {
-	return 1.0 - smoothstep(radius * 0.3, radius, dist);
-}
-
-vec4 CalcSpecular(vec4 lightColor, vec4 viewVec,  vec4 lightVec, vec4 normal) {
-	vec4 R = normalize( reflect(-lightVec, normal));
-	float RdotV = max( dot(R, viewVec), 0.0);
-	return lightColor * pow(RdotV, 90.0);
-}
-
-vec4 CalcDiffuse(vec4 lightColor, vec4 lightVec, vec4 normal) {
-	float power = max( dot(normal, lightVec), 0.0);
-	return lightColor * power;
-}
-
-LightResult CalcPointLightSource(vec4 lightPos, float lightRadius, vec4 lightColor, float intensity, vec4 viewVec, vec4 position, vec4 normal, float falloff)
-{
-	vec4 L = lightPos - position;
-	float dist = length(L);
-	L = normalize(L);
-
-	float attenuation = CalcAttenuation(lightRadius, dist, falloff);
-
-	LightResult result;
-	result.Diffuse = CalcDiffuse(lightColor, L, normal) * attenuation * intensity;
-	result.Specular = CalcSpecular(lightColor, viewVec, L, normal) * attenuation *  intensity;
-	return result;
-}
-
-LightResult CalcDirectionalLightSource(vec4 direction, vec4 color, float intensity, vec4 viewVec, vec4 vertNormal)
-{
-	vec4 L = normalize( -vec4(direction.xyz, 0) );
-
-	LightResult result;
-	result.Diffuse = CalcDiffuse(color, L, vertNormal) * intensity;
-	result.Specular = CalcSpecular(color, viewVec, L, vertNormal) * intensity;
-	return result;
-}
-
-vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textureCoordinate, sampler2D normalMap)
-{
-	mat3 TBN = mat3(tangent, bitangent, normal);
-	vec3 NormalMap = texture(normalMap, textureCoordinate).xyz * 2.0 - vec3(1.0);
-	return vec4(TBN * normalize(NormalMap), 0.0);
-}
-
-vec4 CalcBlendedTexel(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,
-	 				  vec2 R_TileValues,  vec2 G_TileValues,  vec2 B_TileValues){
-	vec4 R_Channel = texture2D(R, Input.TextureCoordinate * R_TileValues);
-	vec4 G_Channel = texture2D(G, Input.TextureCoordinate * G_TileValues);
-	vec4 B_Channel = texture2D(B, Input.TextureCoordinate * B_TileValues);
-
-	float total = blendValue.r + blendValue.g + blendValue.b;
-	float totalDiv = 1.0f / total;
-	blendValue.r = blendValue.r * totalDiv;
-	blendValue.g = blendValue.g * totalDiv;
-	blendValue.b = blendValue.b * totalDiv;
-
-	return blendValue.r * R_Channel
-		 + blendValue.g * G_Channel
-		 + blendValue.b * B_Channel;
-}
-
-vec4 CalcBlendedNormal(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,
-					   vec2 R_TileValues,  vec2 G_TileValues,  vec2 B_TileValues){
-	mat3 TBN = mat3(Input.Tangent, Input.BiTangent, Input.Normal);
-	vec3 R_Channel = texture(R, Input.TextureCoordinate * R_TileValues).xyz * 2.0 - vec3(1.0);
-	vec3 G_Channel = texture(G, Input.TextureCoordinate * G_TileValues).xyz * 2.0 - vec3(1.0);
-	vec3 B_Channel = texture(B, Input.TextureCoordinate * B_TileValues).xyz * 2.0 - vec3(1.0);
-
-	float total = blendValue.r + blendValue.g + blendValue.b + blendValue.a;
-	float totalDiv = 1 / total;
-	blendValue.r = blendValue.r * totalDiv;
-	blendValue.g = blendValue.g * totalDiv;
-	blendValue.b = blendValue.b * totalDiv;
-
-	vec3 Normal_result = blendValue.r * R_Channel
-					   + blendValue.g * G_Channel 
-		 			   + blendValue.b * B_Channel;
-
-	return vec4(TBN * normalize(Normal_result), 0.0);
-}
-
-void main()
-{
-	vec4 splatTexel = texture2D(SplatMapTexture, Input.TextureCoordinate);
-
-	vec4 diffuseTexel = CalcBlendedTexel(splatTexel, DiffuseTexture1, DiffuseTexture2, DiffuseTexture3,
-	 									 DiffuseUVRepeat1, DiffuseUVRepeat2, DiffuseUVRepeat3);
-	vec4 glowTexel = CalcBlendedTexel(splatTexel, GlowMapTexture1, GlowMapTexture2, GlowMapTexture3,
-	 									 GlowUVRepeat1, GlowUVRepeat2, GlowUVRepeat3);
-	vec4 specularTexel = CalcBlendedTexel(splatTexel, SpecularMapTexture1, SpecularMapTexture2, SpecularMapTexture3,
-										 SpecularUVRepeat1, SpecularUVRepeat2, SpecularUVRepeat3);
-	vec4 position = V * M * vec4(Input.Position, 1.0); 
-	//vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate, SplatMapTexture);
-	vec4 normal = V * CalcBlendedNormal(splatTexel, NormalMapTexture1, NormalMapTexture2, NormalMapTexture3,
-		   								NormalUVRepeat1, NormalUVRepeat2, NormalUVRepeat3);
-	normal = normalize(normal);
-	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
-	vec4 viewVec = normalize(-position); 
-
-	vec2 tilePos;
-	tilePos.x = int(gl_FragCoord.x/TILE_SIZE);
-	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
-
-	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
-	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
-
-	int start = int(LightGrids.Data[currentTile].Start);
-	int amount = int(LightGrids.Data[currentTile].Amount);
-
-	for(int i = start; i < start + amount; i++) {
-
-		int l = int(LightIndex[i]);
-		LightSource light = LightSources.List[l];
-
-		LightResult light_result;
-		//These if statements should be removed.
-		if(light.Type == 1) { // point
-			light_result = CalcPointLightSource(V * light.Position, light.Radius, light.Color, light.Intensity, viewVec, position, normal, light.Falloff);
-		} else if (light.Type == 2) { //Directional
-			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
-		}
-		totalLighting.Diffuse += light_result.Diffuse;
-		totalLighting.Specular += light_result.Specular;
-	}
-
-	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
-	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
-	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
-	
-
-	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
-
-	if(pos <= FillPercentage) {
-		color_result += FillColor;
-	}
-	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	color_result += glowTexel*3;
-
-	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
-
-	//Tiled Debug Code
-	/*
-	if(int(gl_FragCoord.x)%16 == 0 || int(gl_FragCoord.y)%16 == 0 ) {
-		sceneColor += vec4(0.5, 0, 0, 0);
-	} else {
-		sceneColor += vec4(LightGrids.Data[int(tilePos.x + tilePos.y*80)].Amount/LightSources.List.length(), 0, 0, 1);
-	}
-	*/
-}
-
-

resources/Shaders/Picking.frag.glsl

@@ -1,16 +1,27 @@
 #version 430
 
 uniform vec2 PickingColor;
+layout (binding = 0) uniform sampler2D Texture;
+uniform vec4 Color;
+uniform vec4 DiffuseColor;
+uniform vec2 DiffuseUVRepeat;
+
 
 in VertexData{
 	vec3 Position;
+	vec2 TextureCoord;
 }Input;
 
 out vec4 TextureFragment;
 
 void main()
 {
-	TextureFragment = vec4(PickingColor/255, 0, 1);
+	vec4 diffuseTexel = texture2D(Texture, Input.TextureCoord * DiffuseUVRepeat);
+
+	if(Color.a * diffuseTexel.a >= 0.9) {
+		TextureFragment = vec4(PickingColor/255, 0, 1);
+	}
+
 }
 
 

resources/Shaders/Picking.vert.glsl

@@ -12,10 +12,12 @@ layout(location = 4) in vec2 TextureCoords;
 
 out VertexData{
 	vec3 Position;
+	vec2 TextureCoord;
 }Output;
 
 void main()
 {
 	gl_Position = P*V*M * vec4(Position, 1.0);
 	Output.Position = Position, 1.0;
+	Output.TextureCoord = TextureCoords;
 }

resources/Shaders/PickingSkinned.vert.glsl

@@ -15,6 +15,7 @@ layout(location = 6) in vec4 BoneWeights;
 
 out VertexData{
 	vec3 Position;
+	vec2 TextureCoord;
 }Output;
 
 void main()
@@ -29,4 +30,5 @@ void main()
 
 	gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
 	Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
+	Output.TextureCoord = TextureCoords;
 }

resources/Shaders/Sprite.frag.glsl

@@ -35,7 +35,6 @@ void main()
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
 
 	//bloomColor = vec4(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);
-	bloomColor = vec4(1.0, 1.0, 1.0, 0.0);
 }
 
 

src/Engine/Collision/Collision.cpp

@@ -6,7 +6,6 @@
 #include "Core/World.h"
 #include "Rendering/Model.h"
 #include "imgui/imgui.h"
-#include "Core/Octree.h"
 
 namespace Collision
 {
@@ -146,14 +145,13 @@ bool RayVsTriangle(const Ray& ray,
 }
 
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix)
+    const std::vector<RawModel::Vertex>& modelVertices,
+    const std::vector<unsigned int>& modelIndices)
 {
-    for (int i = 0; i < modelIndices.size();) {
-        glm::vec3 v0 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        glm::vec3 v1 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        glm::vec3 v2 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
+    for (int i = 0; i < modelIndices.size(); ++i) {
+        glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
+        glm::vec3 v1 = modelVertices[modelIndices[++i]].Position;
+        glm::vec3 v2 = modelVertices[modelIndices[++i]].Position;
         if (RayVsTriangle(ray, v0, v1, v2)) {
             return true;
         }
@@ -194,20 +192,19 @@ bool RayVsTriangle(const Ray& ray,
 }
 
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
     float& outDistance,
     float& outUCoord,
     float& outVCoord)
 {
     outDistance = INFINITY;
     bool hit = false;
-    for (int i = 0; i < modelIndices.size();) {
-        glm::vec3 v0 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        glm::vec3 v1 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        glm::vec3 v2 = Transform::TransformPoint(modelVertices[modelIndices[i++]].Position, modelMatrix);
-        float dist = INFINITY;
+    for (int i = 0; i < modelIndices.size(); ++i) {
+        glm::vec3 v0 = modelVertices[modelIndices[i]].Position;
+        glm::vec3 v1 = modelVertices[modelIndices[++i]].Position;
+        glm::vec3 v2 = modelVertices[modelIndices[++i]].Position;
+        float dist;
         float u;
         float v;
         if (RayVsTriangle(ray, v0, v1, v2, dist, u, v)) {
@@ -221,15 +218,14 @@ bool RayVsModel(const Ray& ray,
 }
 
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<RawModel::Vertex>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix,
     glm::vec3& outHitPosition)
 {
     float u;
     float v;
     float dist;
-    bool hit = RayVsModel(ray, modelVertices, modelIndices, modelMatrix, dist, u, v);
+    bool hit = RayVsModel(ray, modelVertices, modelIndices, dist, u, v);
     outHitPosition = ray.Origin() + dist * ray.Direction();
     return hit;
 }
@@ -576,11 +572,11 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeM
         ComponentWrapper& cAABB = entity["AABB"];
         modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]);
     } else if (entity.HasComponent("Model")) {
+        Model* model;
         std::string res = entity["Model"]["Resource"];
         if (res.empty()) {
             return boost::none;
         }
-        Model* model;
         try {
             model = ResourceManager::Load<::Model, true>(res);
         } catch (const Resource::StillLoadingException&) {
@@ -642,36 +638,4 @@ boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity)
     return aabb;
 }
 
-boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, std::vector<EntityAABB> entitiesPotentiallyHitSorted, float& outDistance, glm::vec3& outIntersectPos)
-{
-    for (EntityAABB& entityBox : entitiesPotentiallyHitSorted) {
-        if (!entityBox.Entity.HasComponent("Model")) {
-            continue;
-        }
-        std::string res = entityBox.Entity["Model"]["Resource"];
-        if (res.empty()) {
-            continue;
-        }
-        Model* model;
-        try {
-            model = ResourceManager::Load<::Model, true>(res);
-        } catch (const std::exception&) {
-            continue;
-        }
-        float u, v;
-        if (RayVsModel(ray, model->Vertices(), model->m_RawModel->m_Indices, Transform::ModelMatrix(entityBox.Entity), outDistance, u, v)) {
-            outIntersectPos = ray.Origin() + outDistance * ray.Direction();
-            return entityBox;
-        }
-    }
-    return boost::none;
-}
-
-boost::optional<EntityAABB> EntityFirstHitByRay(const Ray& ray, Octree<EntityAABB>* octree, float& outDistance, glm::vec3& outIntersectPos)
-{
-    std::vector<EntityAABB> outObjects;
-    octree->ObjectsPossiblyHitByRay(ray, outObjects);
-    return Collision::EntityFirstHitByRay(ray, outObjects, outDistance, outIntersectPos);
-}
-
 }

src/Engine/Core/EntityFilePreprocessor.cpp

@@ -65,6 +65,7 @@ void EntityFilePreprocessor::parseComponentInfo()
 
         // Name
         compInfo.Name = XS::ToString(element->getName());
+        bool brk = compInfo.Name == "HiddenForLocalPlayer";
         // Known allocation
         compInfo.Meta->Allocation = m_ComponentCounts[compInfo.Name];
         // Annotation

src/Engine/Core/Octree.cpp

@@ -5,6 +5,22 @@
 #include "Core/Octree.h"
 #include "Collision/Collision.h"
 
+namespace
+{
+//To be able to sort nodes based on distance to ray origin.
+struct ChildInfo
+{
+    int Index;
+    float Distance;
+};
+
+bool isFirstLower(const ChildInfo& first, const ChildInfo& second)
+{
+    return first.Distance < second.Distance;
+}
+
+}
+
 namespace OctSpace
 {
 
@@ -107,14 +123,14 @@ bool Child::RayCollides(const Ray& ray, OctSpace::Output& data) const
         //If the ray shoots the tree, and it is a parent to 8 children :o
         if (hasChildren()) {
             //Sort children according to their distance from the ray origin.
-            std::vector<RaySorterInfo> childInfos;
+            std::vector<ChildInfo> childInfos;
             childInfos.reserve(8);
             for (int i = 0; i < 8; ++i) {
                 childInfos.push_back({ 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) {
+            for (const ChildInfo& info : childInfos) {
                 if (m_Children[info.Index]->RayCollides(ray, data)) {
                     return true;
                 }
@@ -259,9 +275,4 @@ std::vector<int> Child::childIndicesContainingBox(const AABB& box) const
     }
 }
 
-bool isFirstLower(const RaySorterInfo& first, const RaySorterInfo& second)
-{
-    return first.Distance < second.Distance;
-}
-
 }

src/Engine/Network/Client.cpp

@@ -1,8 +1,10 @@
 #include "Network/Client.h"
+
 using namespace boost::asio::ip;
 
 Client::Client(World* world, EventBroker* eventBroker) 
     : Network(world, eventBroker)
+    , m_Socket(m_IOService)
 {
     // Asumes root node is EntityID_Invalid
     insertIntoServerClientMaps(EntityID_Invalid, EntityID_Invalid);
@@ -12,6 +14,7 @@ Client::Client(World* world, EventBroker* eventBroker)
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
     m_PlayerName = config->Get<std::string>("Networking.Name", "Raptorcopter");
     m_SendInputIntervalMs = config->Get<int>("Networking.SendInputIntervalMs", 33);
+
     LOG_INFO("Client initialized");
 }
 
@@ -23,77 +26,70 @@ Client::Client(World* world, EventBroker* eventBroker, std::unique_ptr<SnapshotF
 
 Client::~Client()
 { }
-// Need to call connect at start
+
 void Client::Connect(std::string address, int port)
 {
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Client::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Client::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Client::OnPlayerSpawned);
+
     auto config = ResourceManager::Load<ConfigFile>("Config.ini");
-    m_Address = address;
     if (address.empty()) {
-        m_Address = config->Get<std::string>("Networking.Address", "127.0.0.1");
+        address = config->Get<std::string>("Networking.Address", "127.0.0.1");
     }
-    m_Port = port;
     if (port == 0) {
-        m_Port = config->Get<int>("Networking.Port", 27666);
+        port = config->Get<int>("Networking.Port", 27666);
     }
+
+    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string(address), port);
+    LOG_INFO("Client connecting...");
+    m_Socket.connect(m_ReceiverEndpoint);
+    connect();
 }
 
 void Client::Update()
 {
     m_EventBroker->Process<Client>();
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet);
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
-    while (m_Reliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Reliable.Receive(packet);
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseTCPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-
-    }
-
+    readFromServer();
     if (m_IsConnected) {
-        // Don't send 1 input in 1 packet, bunch em up.
+        hasServerTimedOut();
+        // Don't sent 1 input in 1 packet, bunch em up.
         if (m_SendInputIntervalMs < (1000 * (std::clock() - m_TimeSinceSentInputs) / (double)CLOCKS_PER_SEC)) {
             sendInputCommands();
             m_TimeSinceSentInputs = std::clock();
         }
         // HACK: Send absolute player positions for now to avoid desync until we have reliable messages
         sendLocalPlayerTransform();
-
-        hasServerTimedOut();
     }
-    //Network::Update();
+    Network::Update();
+}
+
+void Client::readFromServer()
+{
+    while (m_Socket.available()) {
+        bytesRead = receive(readBuf);
+        if (bytesRead > 0) {
+            Packet packet(readBuf, bytesRead);
+            parseMessageType(packet);
+        }
+    }
 }
 
 void Client::parseMessageType(Packet& packet)
 {
-    // Pop packetSize which is used by TCP Client to
-    // create a packet of the correct size
-    packet.ReadPrimitive<int>();
     int messageType = packet.ReadPrimitive<int>();
     if (messageType == -1)
         return;
     // Read packet ID 
     m_PreviousPacketID = m_PacketID;    // Set previous packet id
     m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    //identifyPacketLoss();
+    identifyPacketLoss();
 
     switch (static_cast<MessageType>(messageType)) {
+    case MessageType::Connect:
+        parseConnect(packet);
+        break;
     case MessageType::Ping:
         parsePing();
         break;
@@ -119,40 +115,17 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::ComponentDeleted:
         parseComponentDeletion(packet);
         break;
-    case MessageType::OnPlayerDamage:
-        parsePlayerDamage(packet);
-        break;
     default:
         break;
     }
 }
 
-void Client::parseUDPConnect(Packet& packet)
+void Client::parseConnect(Packet& packet)
 {
     // Map ServerEntityID and your PlayerID
     LOG_INFO("I be connected PogChamp");
 }
 
-void Client::parseTCPConnect(Packet& packet)
-{
-    LOG_INFO("Received TCP connect from server");
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    // parse player id and other stuff
-    m_PlayerID = packet.ReadPrimitive<int>();
-    m_PlayerID = packet.ReadPrimitive<int>();
-    LOG_INFO("A Player connected");
-    Packet UnreliablePacket(MessageType::Connect, m_SendPacketID);
-    // Add player id and other stuff
-    packet.WritePrimitive(m_PlayerID);
-    m_Unreliable.Send(packet);
-    LOG_INFO("Sent UDP Connect Server");
-}
-
 void Client::parsePlayerConnected(Packet & packet)
 {
     // Map ServerEntityID and other player's PlayerID
@@ -170,7 +143,7 @@ void Client::parsePing()
 
     Packet packet(MessageType::Ping, m_SendPacketID);
     packet.WriteString("Ping recieved");
-    m_Reliable.Send(packet);
+    send(packet);
 }
 
 void Client::parseKick()
@@ -179,41 +152,14 @@ void Client::parseKick()
     m_IsConnected = false;
 }
 
-void Client::parseSpawnEvents()
-{
-    std::vector<Events::PlayerSpawned> tempSpawn;
-    for (int i = 0; i < m_PlayerSpawnEvents.size(); i++) {
-        Events::PlayerSpawned e;
-        if (!serverClientMapsHasEntity(m_PlayerSpawnEvents.at(i).Player.ID)) {
-            tempSpawn.push_back(m_PlayerSpawnEvents.at(i));
-            continue;
-        }
-        e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Player.ID));
-        //e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID.at(m_PlayerSpawnEvents.at(i).Spawner.ID));
-        e.PlayerID = -1; 
-        e.PlayerName = m_PlayerSpawnEvents.at(i).PlayerName;
-        m_EventBroker->Publish(e);
-    }
-    m_PlayerSpawnEvents = tempSpawn;
-   // m_PlayerSpawnEvents.clear();
-}
-
 void Client::parsePlayersSpawned(Packet& packet)
 {
-    //Events::PlayerSpawned e;
-    //e.Player = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
-    //e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
-    //e.PlayerID = -1;
-    //e.PlayerName = packet.ReadString();
-    //m_EventBroker->Publish(e);
-
     Events::PlayerSpawned e;
-    e.Player = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
-    e.Spawner = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
+    e.Player = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
+    e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
     e.PlayerID = -1;
     e.PlayerName = packet.ReadString();
-    m_PlayerSpawnEvents.push_back(e);
-    parseSpawnEvents();
+    m_EventBroker->Publish(e);
 }
 
 void Client::parseEntityDeletion(Packet & packet)
@@ -289,15 +235,10 @@ void Client::parseSnapshot(Packet& packet)
     for (std::size_t i = 0; i < numInputCommands; ++i) {
         Events::InputCommand e;
         e.PlayerID = packet.ReadPrimitive<EntityID>();
-        EntityID player = packet.ReadPrimitive<EntityID>();
-        std::string command = packet.ReadString();
-        float value = packet.ReadPrimitive<float>();
-        if (m_ServerIDToClientID.find(player) != m_ServerIDToClientID.end()) {
-            e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(player));
-            e.Command = command;
-            e.Value = value;
-            m_EventBroker->Publish(e);
-        }
+        e.Player = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
+        e.Command = packet.ReadString();
+        e.Value = packet.ReadPrimitive<float>();
+        m_EventBroker->Publish(e);
     }
 
     // Read world state
@@ -356,17 +297,56 @@ void Client::parseSnapshot(Packet& packet)
             m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
         }
     }
-    parseSpawnEvents();
+}
+
+size_t Client::receive(char* data)
+{
+    boost::system::error_code error;
+
+    size_t bytesReceived = m_Socket.receive_from(boost
+        ::asio::buffer((void*)data, INPUTSIZE),
+        m_ReceiverEndpoint,
+        0, error);
+    // Network Debug data
+    if (isReadingData) {
+        m_NetworkData.TotalDataReceived += bytesReceived;
+        m_NetworkData.DataReceivedThisInterval += bytesReceived;
+        m_NetworkData.AmountOfMessagesReceived++;
+    }
+    if (error) {
+        //LOG_ERROR("receive: %s", error.message().c_str());
+    }
+    return bytesReceived;
+}
+
+void Client::send(Packet& packet)
+{
+    m_Socket.send_to(boost::asio::buffer(
+        packet.Data(),
+        packet.Size()),
+        m_ReceiverEndpoint, 0);
+    // Network Debug data
+    if (isReadingData) {
+        m_NetworkData.TotalDataSent += packet.Size();
+        m_NetworkData.DataSentThisInterval += packet.Size();
+        m_NetworkData.AmountOfMessagesSent++;
+    }
+}
+
+void Client::connect()
+{
+    Packet packet(MessageType::Connect, m_SendPacketID);
+    packet.WriteString(m_PlayerName);
+    m_StartPingTime = std::clock();
+    send(packet);
 }
 
 void Client::disconnect()
 {
-    m_IsConnected = false;
     m_PreviousPacketID = 0;
     m_PacketID = 0;
     Packet packet(MessageType::Disconnect, m_SendPacketID);
-    m_Reliable.Send(packet);
-    m_Reliable.Disconnect();
+    send(packet);
 }
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
@@ -377,8 +357,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
     if (e.Command == "ConnectToServer") { // Connect for now
         if (e.Value > 0) {
-            m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
-            m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
+            connect();
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
@@ -401,9 +380,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
             m_SaveDataTimer = std::clock();
         }
     } else {
-        if (m_IsConnected) {
-            m_InputCommandBuffer.push_back(e);
-        }
+        m_InputCommandBuffer.push_back(e);
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
     }
@@ -412,17 +389,11 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
 
 bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    if (e.Inflictor != m_LocalPlayer) {
-        return false;
-    }
-
     Packet packet(MessageType::OnPlayerDamage, m_SendPacketID);
-    packet.WritePrimitive(m_ClientIDToServerID.at(e.Inflictor.ID));
-    packet.WritePrimitive(m_ClientIDToServerID.at(e.Victim.ID));
     packet.WritePrimitive(e.Damage);
-    m_Reliable.Send(packet);
-
-    return true;
+    packet.WritePrimitive(m_ClientIDToServerID.at(e.Player.ID));
+    send(packet);
+    return false;
 }
 
 bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
@@ -433,45 +404,23 @@ bool Client::OnPlayerSpawned(const Events::PlayerSpawned& e)
     return true;
 }
 
-void Client::parsePlayerDamage(Packet& packet)
-{
-    Events::PlayerDamage e;
-    e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
-    e.Victim = EntityWrapper(m_World, m_ServerIDToClientID.at(packet.ReadPrimitive<EntityID>()));
-    e.Damage = packet.ReadPrimitive<double>();
-    // Don't rebroadcast our own player damage events or we'll have an infinite loop!
-    if (e.Inflictor != m_LocalPlayer) {
-        m_EventBroker->Publish(e);
-    }
-}
-
 void Client::sendLocalPlayerTransform()
 {
     if (!m_LocalPlayer.Valid()) {
         return;
     }
 
-    Packet packet(MessageType::PlayerTransform, m_SendPacketID);
-
     ComponentWrapper cTransform = m_LocalPlayer["Transform"];
     glm::vec3& position = cTransform["Position"];
     glm::vec3& orientation = cTransform["Orientation"];
+    Packet packet(MessageType::PlayerTransform, m_SendPacketID);
     packet.WritePrimitive(position.x);
     packet.WritePrimitive(position.y);
     packet.WritePrimitive(position.z);
     packet.WritePrimitive(orientation.x);
     packet.WritePrimitive(orientation.y);
     packet.WritePrimitive(orientation.z);
- 
-    bool hasAssaultWeapon = m_LocalPlayer.HasComponent("AssaultWeapon");
-    packet.WritePrimitive(hasAssaultWeapon);
-    if (hasAssaultWeapon) {
-        ComponentWrapper cAssaultWeapon = m_LocalPlayer["AssaultWeapon"];
-        packet.WritePrimitive((int)cAssaultWeapon["MagazineAmmo"]);
-        packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
-    }
-    
-    m_Unreliable.Send(packet);
+    send(packet);
 }
 
 void Client::identifyPacketLoss()
@@ -483,15 +432,17 @@ void Client::identifyPacketLoss()
     }
 }
 
-void Client::hasServerTimedOut()
+bool Client::hasServerTimedOut()
 {
     // Time in ms
     double timeSincePing = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
     if (timeSincePing > m_TimeoutMs) {
         // Clear everything and go to menu.
         LOG_INFO("Server has timed out, returning to menu, Beep Boop.");
-        disconnect();
+        m_IsConnected = false;
+        return true;
     }
+    return false;
 }
 
 EntityID Client::createPlayer()
@@ -512,7 +463,7 @@ void Client::sendInputCommands()
             packet.WriteString(m_InputCommandBuffer[i].Command);
             packet.WritePrimitive(m_InputCommandBuffer[i].Value);
         }
-        m_Reliable.Send(packet);
+        send(packet);
         m_InputCommandBuffer.clear();
     }
 }
@@ -520,7 +471,7 @@ void Client::sendInputCommands()
 void Client::becomePlayer()
 {
     Packet packet = Packet(MessageType::BecomePlayer, m_SendPacketID);
-    m_Reliable.Send(packet);
+    send(packet);
 }
 
 bool Client::clientServerMapsHasEntity(EntityID clientEntityID)
@@ -551,6 +502,7 @@ void Client::insertIntoServerClientMaps(EntityID serverEntityID, EntityID client
 {
     m_ServerIDToClientID.insert(std::make_pair(serverEntityID, clientEntityID));
     m_ClientIDToServerID.insert(std::make_pair(clientEntityID, serverEntityID));
+
 }
 
 void Client::deleteFromServerClientMaps(EntityID serverEntityID, EntityID clientEntityID)

src/Engine/Network/HybridClient.cpp

@@ -1,10 +0,0 @@
-#include "Network/HybridClient.h"
-
-
-HybridClient::HybridClient()
-{
-}
-
-HybridClient::~HybridClient()
-{
-}

src/Engine/Network/HybridServer.cpp

@@ -1,9 +0,0 @@
-#include "Network/HybridServer.h"
-
-HybridServer::HybridServer()
-{ 
-}
-
-HybridServer::~HybridServer()
-{
-}

src/Engine/Network/Network.cpp

@@ -14,21 +14,6 @@ void Network::Update()
     updateNetworkData();
 }
 
-void Network::logSentData(int bytesSent)
-{ 
-
-}
-
-void Network::logReceivedData(int bytesReceived)
-{ 
-    // Network Debug data
-    if (isReadingData) {
-        m_NetworkData.TotalDataReceived += bytesReceived;
-        m_NetworkData.DataReceivedThisInterval += bytesReceived;
-        m_NetworkData.AmountOfMessagesReceived++;
-    }
-}
-
 void Network::saveToFile()
 {
     std::ofstream outfile;

src/Engine/Network/Packet.cpp

@@ -34,12 +34,10 @@ void Packet::Init(MessageType type, unsigned int & packetID)
     m_ReturnDataOffset = 0;
     m_Offset = 0;
     // Create message header
-    // allocate memory for size of packet(only used in tcp)
-    WritePrimitive<int>(0);
     // Add message type
     int messageType = static_cast<int>(type);
-    WritePrimitive<int>(messageType);
-    WritePrimitive<int>(packetID);
+    Packet::WritePrimitive<int>(messageType);
+    Packet::WritePrimitive<int>(packetID);
     packetID++;
     m_HeaderSize = m_Offset;
 }
@@ -58,12 +56,9 @@ void Packet::WriteString(const std::string& str)
 
 void Packet::WriteData(char * data, int sizeOfData)
 {
-
     if (m_Offset + sizeOfData > m_MaxPacketSize) {
         //LOG_WARNING("Packet::WriteData(): Data size in packet exceeded maximum packet size. New size is %i bytes\n", m_MaxPacketSize*2);
-        while (m_Offset + sizeOfData > m_MaxPacketSize) {
-            resizeData();
-        }
+        resizeData();
     }
     memcpy(m_Data + m_Offset, data, sizeOfData);
     m_Offset += sizeOfData;
@@ -81,35 +76,14 @@ std::string Packet::ReadString()
     return returnValue;
 }
 
-void Packet::ReconstructFromData(char * data, size_t sizeOfData)
+char * Packet::ReadData(int SizeOfData)
 {
-    if (sizeOfData > m_MaxPacketSize) {
-        // Delete our data
-        delete[] m_Data;
-        // Set new max size
-        m_MaxPacketSize = sizeOfData;
-        m_Data = new char[m_MaxPacketSize];
-        // while we resized the old data container.
-    }
-    memcpy(m_Data, data, sizeOfData);
-    m_Offset = sizeOfData;
-
-}
-
-void Packet::UpdateSize()
-{
-    int whatisoffset = m_Offset;
-    memcpy(m_Data, &m_Offset, sizeof(int));
-}
-
-char * Packet::ReadData(int sizeOfData)
-{
-    if (m_Offset < m_ReturnDataOffset + sizeOfData) {
+    if (m_Offset < m_ReturnDataOffset + SizeOfData) {
         //LOG_WARNING("packet ReadData(): Oh no! You are trying to remove things outside my memory kingdom");
         return nullptr;
     }
     size_t oldReturnDataOffset = m_ReturnDataOffset;
-    m_ReturnDataOffset += sizeOfData;
+    m_ReturnDataOffset += SizeOfData;
     return (m_Data + oldReturnDataOffset);
 }
 
@@ -117,36 +91,25 @@ void Packet::ChangePacketID(unsigned int & packetID)
 {
     packetID = packetID + 1;
     // Overwrite old PacketID
-    memcpy(m_Data + 2*sizeof(int), &packetID, sizeof(int));
-}
-
-MessageType Packet::GetMessageType()
-{
-    MessageType messagType;
-    memcpy(&messagType, m_Data + sizeof(int), sizeof(int));
-    return messagType;
+    memcpy(m_Data + sizeof(int), &packetID, sizeof(int));
 }
 
 void Packet::resizeData()
 {
-    resizeData(m_MaxPacketSize * 2);
-}
 
-void Packet::resizeData(int size)
-{
     // Allocate memory to store our data in
     char* holdData = new char[m_MaxPacketSize];
     // Copy our data to the newly allocated memory
     memcpy(holdData, m_Data, m_Offset);
     // Increase max packet size
-    m_MaxPacketSize = size;
+    m_MaxPacketSize = m_MaxPacketSize * 2;
     // Delete our data
-    delete[] m_Data;
-    // Allocate memory
+    delete m_Data;
+    // Allocate twice the memory we had before
     m_Data = new char[m_MaxPacketSize];
     // Copy our data to new location
     memcpy(m_Data, holdData, m_Offset);
     // Delete the memory allocated to hold our data
     // while we resized the old data container.
-    delete[] holdData;
+    delete holdData;
 }

src/Engine/Network/Server.cpp

@@ -6,18 +6,19 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
     snapshotInterval = 1000 * config->Get<float>("Networking.SnapshotInterval", 0.05f);
     pingIntervalMs = config->Get<float>("Networking.PingIntervalMs", 1000);
+
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Server::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &Server::OnEntityDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
-    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
 
     // Bind
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
     }
     m_Port = port;
+    m_Socket = std::make_unique<boost::asio::ip::udp::socket>(m_IOService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), port));
     LOG_INFO("Server initialized and bound to port %i", port);
 }
 
@@ -28,58 +29,7 @@ Server::~Server()
 
 void Server::Update()
 {
-    PlayerDefinition pd;
-
-    m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
-    for (auto& kv : m_ConnectedPlayers) {
-        while (kv.second.TCPSocket->available()) {
-            // Packet will get real data in receive
-            Packet packet(MessageType::Invalid);
-            m_Reliable.Receive(packet, kv.second);
-            m_Address = kv.second.TCPSocket->remote_endpoint().address();
-            m_Port = kv.second.TCPSocket->remote_endpoint().port();
-            if (packet.GetMessageType() == MessageType::Connect) {
-                parseTCPConnect(packet);
-            } else {
-                parseMessageType(packet);
-            }
-        }
-    }
-
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet, pd);
-        m_Address = pd.Endpoint.address();
-        m_Port = pd.Endpoint.port();
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
-    // Check if players have disconnected
-    for (int i = 0; i < m_PlayersToDisconnect.size(); i++) {
-        disconnect(m_PlayersToDisconnect.at(i));
-    }
-    m_PlayersToDisconnect.clear();
-
-    std::clock_t currentTime = std::clock();
-    // Send snapshot
-    if (snapshotInterval < (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC)) {
-        sendSnapshot();
-        previousSnapshotMessage = currentTime;
-    }
-    // Send pings each 
-    if (pingIntervalMs < (1000 * (currentTime - previousePingMessage) / (double)CLOCKS_PER_SEC)) {
-        sendPing();
-        previousePingMessage = currentTime;
-    }
-    // Time out logic
-    if (checkTimeOutInterval < (1000 * (currentTime - timOutTimer) / (double)CLOCKS_PER_SEC)) {
-        checkForTimeOuts();
-        timOutTimer = currentTime;
-    }
+    readFromClients();
     m_EventBroker->Process<Server>();
     if (isReadingData) {
         Network::Update();
@@ -87,20 +37,48 @@ void Server::Update()
 
 }
 
+void Server::readFromClients()
+{
+    while (m_Socket->available()) {
+        try {
+            bytesRead = receive(readBuffer);
+            Packet packet(readBuffer, bytesRead);
+            parseMessageType(packet);
+        } catch (const std::exception&) {
+            //LOG_ERROR("%i: Read from client crashed %s", m_PacketID, err.what());
+        }
+    }
+    std::clock_t currentTime = std::clock();
+    // Send snapshot
+    if (snapshotInterval < (1000 * (currentTime - previousSnapshotMessage) / (double)CLOCKS_PER_SEC)) {
+        sendSnapshot();
+        previousSnapshotMessage = currentTime;
+    }
+
+    // Send pings each 
+    if (pingIntervalMs < (1000 * (currentTime - previousePingMessage) / (double)CLOCKS_PER_SEC)) {
+        sendPing();
+        previousePingMessage = currentTime;
+    }
+
+    // Time out logic
+    if (checkTimeOutInterval < (1000 * (currentTime - timOutTimer) / (double)CLOCKS_PER_SEC)) {
+        checkForTimeOuts();
+        timOutTimer = currentTime;
+    }
+}
+
 void Server::parseMessageType(Packet& packet)
 {
-    // Pop packetSize which is used by TCP Client to
-    // create a packet of the correct size
-    packet.ReadPrimitive<int>();
-
     int messageType = packet.ReadPrimitive<int>(); // Read what type off message was sent from server
+
     // Read packet ID 
     m_PreviousPacketID = m_PacketID;    // Set previous packet id
     m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
     //identifyPacketLoss();
     switch (static_cast<MessageType>(messageType)) {
     case MessageType::Connect:
-        //parseConnect(packet);
+        parseConnect(packet);
         break;
     case MessageType::Ping:
         parsePing();
@@ -126,19 +104,60 @@ void Server::parseMessageType(Packet& packet)
     }
 }
 
-void Server::reliableBroadcast(Packet& packet)
+size_t Server::receive(char * data)
 {
-    for (auto& kv : m_ConnectedPlayers) {
-        packet.ChangePacketID(kv.second.PacketID);
-        m_Reliable.Send(packet, kv.second);
+    size_t length = m_Socket->receive_from(
+        boost::asio::buffer((void*)data
+            , INPUTSIZE)
+        , m_ReceiverEndpoint, 0);
+    // Network Debug data
+    if (isReadingData) {
+        m_NetworkData.TotalDataReceived += length;
+        m_NetworkData.DataReceivedThisInterval += length;
+        m_NetworkData.AmountOfMessagesReceived++;
+    }
+    return length;
+}
+
+void Server::send(PlayerID player, Packet& packet)
+{
+    try {
+        size_t bytesSent = m_Socket->send_to(
+            boost::asio::buffer(packet.Data(), packet.Size()),
+            m_ConnectedPlayers[player].Endpoint,
+            0);
+        // Network Debug data
+        if (isReadingData) {
+            m_NetworkData.TotalDataSent += packet.Size();
+            m_NetworkData.DataSentThisInterval += packet.Size();
+            m_NetworkData.AmountOfMessagesSent++;
+        }
+    } catch (const boost::system::system_error&) {
+        // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
+        m_ConnectedPlayers[player].Endpoint = boost::asio::ip::udp::endpoint();
     }
 }
 
-void Server::unreliableBroadcast(Packet& packet)
+void Server::send(Packet & packet)
+{
+    m_Socket->send_to(
+        boost::asio::buffer(
+            packet.Data(),
+            packet.Size()),
+        m_ReceiverEndpoint,
+        0);
+    if (isReadingData) {
+        // Network Debug data
+        m_NetworkData.TotalDataSent += packet.Size();
+        m_NetworkData.DataSentThisInterval += packet.Size();
+    }
+}
+
+void Server::broadcast(Packet& packet)
 {
     for (auto& kv : m_ConnectedPlayers) {
         packet.ChangePacketID(kv.second.PacketID);
-        m_Unreliable.Send(packet, kv.second);
+        send(kv.first, packet);
     }
 }
 
@@ -148,7 +167,7 @@ void Server::sendSnapshot()
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
     addChildrenToPacket(packet, EntityID_Invalid);
-    unreliableBroadcast(packet);
+    broadcast(packet);
 }
 
 void Server::addInputCommandsToPacket(Packet& packet)
@@ -171,12 +190,6 @@ void Server::addChildrenToPacket(Packet & packet, EntityID entityID)
     // Loop through every child
     for (auto it = itPair.first; it != itPair.second; it++) {
         EntityID childEntityID = it->second;
-        // HACK: Only sync players for now, since the map turned out to be TOO LARGE to send in one snapshot and Simon's computer shits itself
-        EntityWrapper childEntity(m_World, childEntityID);
-        if (!shouldSendToClient(childEntity)) {
-            continue;
-        }
-
         // Write EntityID and parentsID and Entity name
         packet.WritePrimitive(childEntityID);
         packet.WritePrimitive(entityID);
@@ -228,7 +241,7 @@ void Server::sendPing()
     // Time message
     m_StartPingTime = std::clock();
     // Send message
-    reliableBroadcast(packet);
+    broadcast(packet);
 }
 
 void Server::checkForTimeOuts()
@@ -236,91 +249,16 @@ void Server::checkForTimeOuts()
     double startPing = 1000 * m_StartPingTime
         / static_cast<double>(CLOCKS_PER_SEC);
 
-    std::vector<PlayerID> playersToRemove;
-    for (auto& kv : m_ConnectedPlayers) {
-        if (kv.second.TCPAddress != boost::asio::ip::address()) {
-            int stopPing = 1000 * kv.second.StopTime /
+    for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
+        if (m_ConnectedPlayers[i].Endpoint.address() != boost::asio::ip::address()) {
+            double stopPing = 1000 * m_ConnectedPlayers[i].StopTime /
                 static_cast<double>(CLOCKS_PER_SEC);
             if (startPing > stopPing + m_TimeoutMs) {
-                LOG_INFO("User %i timed out!", kv.second.Name);
-                playersToRemove.push_back(kv.first);
+                //LOG_INFO("User %i timed out!", i);
+                //disconnect(i);
             }
         }
     }
-    for (size_t i = 0; i < playersToRemove.size(); i++) {
-        disconnect(playersToRemove.at(i));
-    }
-}
-
-void Server::parseUDPConnect(Packet & packet)
-{
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    // parse player id and other stuff
-    PlayerID playerID = packet.ReadPrimitive<int>();
-    // Do something here?
-    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
-    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
-    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
-    // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
-    m_Unreliable.Send(connnectPacket);
-    LOG_INFO("UDP Connect sent to client");
-}
-
-void Server::parseTCPConnect(Packet & packet)
-{
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    
-    LOG_INFO("Parsing connections");
-    // Check if player is already connected
-    // Ska vara till lagd i TCPServer receive
-    PlayerID playerID = GetPlayerIDFromEndpoint();
-    if (playerID == -1) {
-        return;
-    }
-    // Create a new player
-    m_ConnectedPlayers.at(playerID).EntityID = 0; // Overlook this
-    m_ConnectedPlayers.at(playerID).Name = packet.ReadString();
-    m_ConnectedPlayers.at(playerID).PacketID = 0;
-    m_ConnectedPlayers.at(playerID).StopTime = std::clock();
-    m_ConnectedPlayers.at(playerID).TCPAddress = m_Address;
-    m_ConnectedPlayers.at(playerID).TCPPort = m_Port;
-
-    LOG_INFO("parseTCPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(),
-        m_ConnectedPlayers.at(playerID).TCPAddress.to_string().c_str());
-
-    // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
-    // Write playerID to packet
-    connnectPacket.WritePrimitive(playerID);
-    m_Reliable.Send(connnectPacket);
-
-    // Send notification that a player has connected
-    //Packet notificationPacket(MessageType::PlayerConnected);
-    //broadcast(notificationPacket);
-}
-
-void Server::parseDisconnect()
-{
-    LOG_INFO("%i: Parsing disconnect", m_PacketID);
-
-    for (auto& kv : m_ConnectedPlayers) {
-        if (kv.second.TCPAddress == m_Address &&
-            kv.second.TCPPort == m_Port) {
-            m_PlayersToDisconnect.push_back(kv.first);
-            break;
-        }
-    }
 }
 
 void Server::disconnect(PlayerID playerID)
@@ -329,26 +267,113 @@ void Server::disconnect(PlayerID playerID)
     LOG_INFO("User %s disconnected/timed out", m_ConnectedPlayers[playerID].Name.c_str());
     // Remove enteties and stuff (When we can remove entity, remove it and tell clients to remove the copy they have)
     Events::PlayerDisconnected e;
-    e.Entity = m_ConnectedPlayers.at(playerID).EntityID;
+    e.Entity = m_ConnectedPlayers[playerID].EntityID;
     e.PlayerID = playerID;
     m_EventBroker->Publish(e);
-    //m_World->DeleteEntity(m_ConnectedPlayers[playerID].EntityID);
-    m_ConnectedPlayers[playerID].TCPSocket->shutdown(boost::asio::ip::tcp::socket::shutdown_both);
-    m_ConnectedPlayers[playerID].TCPSocket->close();
+
     m_ConnectedPlayers.erase(playerID);
-    // Send disconnect to the other players.
+}
+
+void Server::parseOnInputCommand(Packet& packet)
+{
+    PlayerID player = -1;
+    // Check which player it was who sent the message
+    player = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
+    if (player != -1) {
+        while (packet.DataReadSize() < packet.Size()) {
+            Events::InputCommand e;
+            e.Command = packet.ReadString();
+            e.PlayerID = player; // Set correct player id
+            e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
+            e.Value = packet.ReadPrimitive<float>();
+            m_EventBroker->Publish(e);
+
+            if (e.Command == "PrimaryFire") {
+                m_InputCommandsToBroadcast.push_back(e);
+            }
+            //LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
+        }
+    }
 }
 
 void Server::parseOnPlayerDamage(Packet & packet)
 {
     Events::PlayerDamage e;
-    e.Inflictor = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
-    e.Victim = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
     e.Damage = packet.ReadPrimitive<double>();
+    e.Player = EntityWrapper(m_World, packet.ReadPrimitive<EntityID>());
     m_EventBroker->Publish(e);
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }
 
+void Server::parseConnect(Packet& packet)
+{
+    LOG_INFO("Parsing connections");
+    // Check if player is already connected
+    if (GetPlayerIDFromEndpoint(m_ReceiverEndpoint) != -1) {
+        return;
+    }
+    for (auto& kv : m_ConnectedPlayers) {
+        if (kv.second.Endpoint.address() == m_ReceiverEndpoint.address() &&
+            kv.second.Endpoint.port() == m_ReceiverEndpoint.port()) {
+            // Already connected 
+            return;
+        }
+    }
+    // Create a new player
+    PlayerDefinition pd;
+    pd.EntityID = 0; // Overlook this
+    pd.Endpoint = m_ReceiverEndpoint;
+    pd.Name = packet.ReadString();
+    pd.PacketID = 0;
+    pd.StopTime = std::clock();
+    m_ConnectedPlayers[m_NextPlayerID++] = pd;
+    LOG_INFO("Spectator \"%s\" connected on IP: %s", pd.Name.c_str(), pd.Endpoint.address().to_string().c_str());
+
+    // Send a message to the player that connected
+    Packet connnectPacket(MessageType::Connect, pd.PacketID);
+    send(connnectPacket);
+
+    // Send notification that a player has connected
+    Packet notificationPacket(MessageType::PlayerConnected);
+    broadcast(notificationPacket);
+}
+
+void Server::parseDisconnect()
+{
+    LOG_INFO("%i: Parsing disconnect", m_PacketID);
+
+    for (auto& kv : m_ConnectedPlayers) {
+        if (kv.second.Endpoint.address() == m_ReceiverEndpoint.address() &&
+            kv.second.Endpoint.port() == m_ReceiverEndpoint.port()) {
+            disconnect(kv.first);
+            break;
+        }
+    }
+}
+
+void Server::parseClientPing()
+{
+    LOG_INFO("%i: Parsing ping", m_PacketID);
+    PlayerID player = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
+    if (player == -1) {
+        return;
+    }
+    // Return ping
+    Packet packet(MessageType::Ping, m_ConnectedPlayers[player].PacketID);
+    packet.WriteString("Ping received");
+    send(packet);
+}
+
+void Server::parsePing()
+{
+    for (int i = 0; i < m_ConnectedPlayers.size(); i++) {
+        if (m_ConnectedPlayers[i].Endpoint.address() == m_ReceiverEndpoint.address()) {
+            m_ConnectedPlayers[i].StopTime = std::clock();
+            break;
+        }
+    }
+}
+
 void Server::identifyPacketLoss()
 {
     // if no packets lost, difference should be equal to 1
@@ -362,7 +387,18 @@ void Server::kick(PlayerID player)
 {
     disconnect(player);
     Packet packet = Packet(MessageType::Kick);
-    m_Reliable.Send(packet);
+    send(packet);
+}
+
+PlayerID Server::GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint)
+{
+    for (auto& kv : m_ConnectedPlayers) {
+        if (kv.second.Endpoint.address() == endpoint.address() &&
+            kv.second.Endpoint.port() == endpoint.port()) {
+            return kv.first;
+        }
+    }
+    return -1;
 }
 
 bool Server::OnInputCommand(const Events::InputCommand & e)
@@ -391,7 +427,7 @@ bool Server::OnPlayerSpawned(const Events::PlayerSpawned & e)
     packet.WritePrimitive<EntityID>(e.Spawner.ID);
     // We don't send PlayerID here because it will always be set to -1
     packet.WriteString(m_ConnectedPlayers[e.PlayerID].Name);
-    m_Reliable.Send(packet, m_ConnectedPlayers[e.PlayerID]);
+    send(e.PlayerID, packet);
     return false;
 }
 
@@ -400,7 +436,7 @@ bool Server::OnEntityDeleted(const Events::EntityDeleted & e)
     if (!e.Cascaded) {
         Packet packet = Packet(MessageType::EntityDeleted);
         packet.WritePrimitive<EntityID>(e.DeletedEntity);
-        reliableBroadcast(packet);
+        broadcast(packet);
     }
     return false;
 }
@@ -408,72 +444,14 @@ bool Server::OnEntityDeleted(const Events::EntityDeleted & e)
 bool Server::OnComponentDeleted(const Events::ComponentDeleted & e)
 {
     if (!e.Cascaded) {
-        if (shouldSendToClient(EntityWrapper(m_World, e.Entity))) {
-            Packet packet = Packet(MessageType::ComponentDeleted);
-            packet.WritePrimitive<EntityID>(e.Entity);
-            packet.WriteString(e.ComponentType);
-            reliableBroadcast(packet);
-        }
+        Packet packet = Packet(MessageType::ComponentDeleted);
+        packet.WritePrimitive<EntityID>(e.Entity);
+        packet.WriteString(e.ComponentType);
+        broadcast(packet);
     }
     return false;
 }
 
-bool Server::OnPlayerDamage(const Events::PlayerDamage& e)
-{
-    Packet packet(MessageType::OnPlayerDamage);
-    packet.WritePrimitive(e.Inflictor.ID);
-    packet.WritePrimitive(e.Victim.ID);
-    packet.WritePrimitive(e.Damage);
-    reliableBroadcast(packet);
-
-    return false;
-}
-
-void Server::parseClientPing()
-{
-    LOG_INFO("%i: Parsing ping", m_PacketID);
-    PlayerID player = GetPlayerIDFromEndpoint();
-    if (player == -1) {
-        return;
-    }
-    // Return ping
-    Packet packet(MessageType::Ping, m_ConnectedPlayers[player].PacketID);
-    packet.WriteString("Ping received");
-    m_Reliable.Send(packet);
-}
-
-void Server::parsePing()
-{
-    for (auto& kv : m_ConnectedPlayers) {
-        if (kv.second.TCPAddress == m_Address &&
-            kv.second.TCPPort == m_Port) {
-            kv.second.StopTime = std::clock();
-            break;
-        }
-    }
-}
-
-void Server::parseOnInputCommand(Packet& packet)
-{
-    PlayerID player = -1;
-    // Check which player it was who sent the message
-    player = GetPlayerIDFromEndpoint();
-    if (player != -1) {
-        while (packet.DataReadSize() < packet.Size()) {
-            Events::InputCommand e;
-            e.Command = packet.ReadString();
-            e.PlayerID = player; // Set correct player id
-            e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
-            e.Value = packet.ReadPrimitive<float>();
-            m_EventBroker->Publish(e);
-            if (e.Command == "PrimaryFire" || e.Command == "Reload") {
-                m_InputCommandsToBroadcast.push_back(e);
-            }
-            //LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
-        }
-    }
-}
-
 void Server::parsePlayerTransform(Packet& packet)
 {
     glm::vec3 position;
@@ -485,42 +463,11 @@ void Server::parsePlayerTransform(Packet& packet)
     orientation.y = packet.ReadPrimitive<float>();
     orientation.z = packet.ReadPrimitive<float>();
 
-    PlayerID playerID = GetPlayerIDFromEndpoint();
-    bool hasAssaultWeapon = packet.ReadPrimitive<bool>();
-    int magazineAmmo;
-    int ammo;
-    if (hasAssaultWeapon) {
-        magazineAmmo = packet.ReadPrimitive<int>();
-        ammo = packet.ReadPrimitive<int>();
-    }
-
+    PlayerID playerID = GetPlayerIDFromEndpoint(m_ReceiverEndpoint);
     EntityWrapper player(m_World, m_ConnectedPlayers.at(playerID).EntityID);
+
     if (player.Valid()) {
         player["Transform"]["Position"] = position;
         player["Transform"]["Orientation"] = orientation;
-
-        if (hasAssaultWeapon) {
-            player["AssaultWeapon"]["MagazineAmmo"] = magazineAmmo;
-            player["AssaultWeapon"]["Ammo"] = ammo;
-        }
     }
 }
-
-bool Server::shouldSendToClient(EntityWrapper childEntity)
-{
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid();
-}
-
-PlayerID Server::GetPlayerIDFromEndpoint()
-{
-    // check both tcp and udp connection
-    for (auto& kv : m_ConnectedPlayers) {
-        if ((kv.second.TCPAddress == m_Address
-            && kv.second.TCPPort == m_Port)
-            || (kv.second.Endpoint.address() == m_Address
-                && kv.second.Endpoint.port() == m_Port)) {
-            return kv.first;
-        }
-    }
-    return -1;
-}

src/Engine/Network/TCPClient.cpp

@@ -1,107 +0,0 @@
-#include "Network/TCPClient.h"
-
-using namespace boost::asio::ip;
-
-TCPClient::TCPClient()
-{
-}
-
-TCPClient::~TCPClient()
-{
-}
-
-void TCPClient::Connect(std::string playerName, std::string address, int port)
-{
-    if (m_Socket) {
-        if (m_IsConnected) {
-            Packet packet(MessageType::Connect, m_SendPacketID);
-            packet.WriteString(playerName);
-            Send(packet);
-            LOG_INFO("Connect message sent again!");
-        }
-    }
-    else if (!m_IsConnected) {
-        boost::system::error_code error = boost::asio::error::host_not_found;
-        m_Endpoint = tcp::endpoint(boost::asio::ip::address::from_string(address), port);
-        m_Socket = std::unique_ptr<tcp::socket>(new tcp::socket(m_IOService));
-        m_Socket->connect(m_Endpoint, error);
-        tcp::no_delay option(true);
-        m_Socket->set_option(option);
-        LOG_INFO(error.message().c_str());
-        if (!error) {
-            m_IsConnected = true;
-            Packet packet(MessageType::Connect, m_SendPacketID);
-            packet.WriteString(playerName);
-            Send(packet);
-            LOG_INFO("Connect message sent!");
-        }
-        // If error
-        else {
-            m_Socket->close();
-            m_Socket = nullptr;
-        }
-    }
-}
-
-void TCPClient::Disconnect()
-{ 
-    if (!m_IsConnected) {
-        return;
-    }
-    m_Socket->shutdown(boost::asio::ip::tcp::socket::shutdown_both);
-    m_Socket->close();
-    m_Socket = nullptr;
-    m_IsConnected = false;
-}
-
-void TCPClient::Receive(Packet& packet)
-{
-    size_t bytesRead = readBuffer(m_ReadBuffer);
-    if (bytesRead > 0) {
-        packet.ReconstructFromData(m_ReadBuffer, bytesRead);
-    }
-}
-
-size_t TCPClient::readBuffer(char* data)
-{ 
-    if (!m_Socket) {
-        return 0;
-    }
-    boost::system::error_code error;
-    // Read size of packet
-    size_t bytesReceived = m_Socket->read_some(boost
-        ::asio::buffer((void*)data, sizeof(int)),
-        error);
-    int sizeOfPacket = 0;
-    memcpy(&sizeOfPacket, data, sizeof(int));
-
-    // Read the rest of the message
-    bytesReceived += m_Socket->read_some(boost
-        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-        error);
-    if (error) {
-        //LOG_ERROR("receive: %s", error.message().c_str());
-    }
-    return bytesReceived;
-}
-
-void TCPClient::Send(Packet & packet)
-{
-    if (!m_Socket) {
-        LOG_WARNING("TCPClient::Send: Socket is null");
-        return;
-    }
-    packet.UpdateSize();
-    boost::system::error_code error;
-    m_Socket->send(boost::asio::buffer(
-        packet.Data(),
-        packet.Size()), 0, error);
-}
-
-bool TCPClient::IsSocketAvailable()
-{
-    if (!m_Socket) {
-        return false;
-    }
-    return m_Socket->available();
-}