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

Getting ShaderID fewer times

include/Engine/Collision/Collision.h

@@ -84,6 +84,18 @@ bool AABBvsTriangles(const AABB& box,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 
+enum Output
+{
+    OutContained,
+    OutSeparated,
+    OutIntersecting
+};
+//Detects intersection and containment.
+Output AABBvsTrianglesWContainment(const AABB& box,
+    const RawModel::Vertex* modelVertices,
+    const std::vector<unsigned int>& modelIndices,
+    const glm::mat4& modelMatrix);
+
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.

include/Engine/Core/EPlayerDeath.h

@@ -10,8 +10,9 @@ namespace Events
 struct PlayerDeath : Event
 {
     //KilledBy,KilledByWhat is optional for now. It might be used later in the playerlog-system
-    EntityWrapper Player;
-    std::string KilledByWhat;
+    EntityWrapper Player = EntityWrapper::Invalid;
+    EntityWrapper Killer = EntityWrapper::Invalid;
+    std::string KilledByWhat = "";
 };
 
 }

include/Engine/Core/EntityWrapper.h

@@ -23,7 +23,7 @@ struct EntityWrapper
 
     static const EntityWrapper Invalid;
 
-    const std::string Name();
+    const std::string Name() const;
     bool HasComponent(const std::string& componentType);
     void AttachComponent(const char* componentName);
     EntityWrapper Parent();

include/Engine/Core/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Editor/EditorCameraInputController.h

@@ -12,8 +12,8 @@ template <typename EventContext>
 class EditorCameraInputController : public FirstPersonInputController<EventContext>
 {
 public:
-    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID)
-        : FirstPersonInputController(eventBroker, playerID)
+    EditorCameraInputController(EventBroker* eventBroker, unsigned int playerID, EntityWrapper playerEntity)
+        : FirstPersonInputController(eventBroker, playerID, playerEntity)
     {
         EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorCameraInputController::OnMousePress);
         EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorCameraInputController::OnMouseRelease);

include/Engine/Editor/EditorSystem.h

@@ -47,6 +47,7 @@ private:
     // Utility functions
     EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
     void setWidgetMode(EditorGUI::WidgetMode mode);
+    bool isAnyParentMissingTransform(EntityID entityID);
 
     // GUI callbacks
     void OnEntitySelected(EntityWrapper entity);

include/Engine/Input/FirstPersonInputController.h

@@ -6,17 +6,20 @@
 #include "../Core/ELockMouse.h"
 #include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "Rendering/ESetBlendWeight.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, int playerID);
+    FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
     virtual bool Jumping() const { return m_Jumping; }
     virtual bool Crouching() const { return m_Crouching; }
+    virtual bool CrouchingLastFrame() const { return m_CrouchingLastFrame; }
     virtual bool DoubleJumping() const { return m_DoubleJumping; }
     virtual void SetDoubleJumping(bool isDoubleJumping) {
         m_DoubleJumping = isDoubleJumping;
@@ -34,15 +37,17 @@ public:
 
 protected:
     const int m_PlayerID;
+    EntityWrapper m_PlayerEntity;
+
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
     bool m_Jumping = false;
     bool m_DoubleJumping = false;
     bool m_Crouching = false;
+    bool m_CrouchingLastFrame = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_DashEffectResetTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -65,9 +70,10 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity)
     : InputController(eventBroker)
     , m_PlayerID(playerID)
+    , m_PlayerEntity(playerEntity)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
     EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
@@ -78,6 +84,7 @@ void FirstPersonInputController<EventContext>::Reset()
 {
     m_Rotation = glm::vec3(0.f, 0.f, 0.f);
     m_Jumping = false;
+    m_CrouchingLastFrame = m_Crouching;
 }
 
 template <typename EventContext>
@@ -106,7 +113,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     if (e.Command == "Pitch") {
         float val = glm::radians(e.Value);
         m_Rotation.x += -val;
-        //m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
     }
 
     if (e.Command == "Yaw") {
@@ -118,16 +124,155 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         if (e.Command == "Forward") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.z = -val;
+
+            //Animation
+            if (m_PlayerEntity.Valid()) {
+                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+                if (playerModel.Valid()) {
+                    if (val > 0) {  // Walk/Run
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) {   // Walk/run Backwards
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Reverse = true;
+                        m_EventBroker->Publish(aeb);
+                    }
+                }
+
+
+                EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+                if (firstPersonModel.Valid()) {
+                    if (val > 0) {  // Walk/Run
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    } else if (val < 0) {   // Walk/run Backwards
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            aeb.Reverse = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    }
+                }
+            }
         }
         if (e.Command == "Right") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.x = val;
-        }
-        if (glm::length2(m_Movement) > 0) {
-            m_Movement = glm::normalize(m_Movement);
+
+
+            //Animation
+            if (m_PlayerEntity.Valid()) {
+                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+                if (playerModel.Valid()) { //Right Strafe
+                    if (val > 0) {
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Right";
+                        aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) { //LeftStrafe
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Left";
+                        aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    }
+                }
+            }
         }
     }
 
+    //Animation
+    if (glm::length2(m_Movement) < 0.25f) {
+        //Blend to Idle
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "Idle";
+                aeb.RootNode = playerModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+            EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+            if (firstPersonModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "Idle";
+                aeb.RootNode = firstPersonModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+        }
+    } else {
+        //Blend to movement
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "DirectionBlend";
+                aeb.RootNode = playerModel;
+                m_EventBroker->Publish(aeb);
+            }
+        }
+    }
+
+
+    if (glm::length2(m_Movement) > 0) {
+        m_Movement = glm::normalize(m_Movement);
+
+        //Animation
+        // movement direction blend
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                glm::vec2 direction = glm::normalize(glm::vec2(m_Movement.x, m_Movement.z));
+                double weight = glm::abs(glm::dot(glm::vec2(1, 0), direction));
+                Events::SetBlendWeight sbw;
+                sbw.NodeName = "DirectionBlend";
+                sbw.Weight = weight;
+                sbw.RootNode = playerModel;
+                m_EventBroker->Publish(sbw);
+            }
+        }
+    }
+
+        
+
     if (e.Command == "Forward" || e.Command == "Right") {
         if (e.Value != 0) {
             m_CurrentDirectionVector = e.Command == "Right" ? (e.Value > 0 ? "Right" : "Left") : (e.Value > 0 ? "Forward" : "Backward");
@@ -159,6 +304,34 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
 
     if (e.Command == "Crouch") {
         m_Crouching = e.Value > 0;
+
+
+        //Animation
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                if (e.Value == 0.f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "StandMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                } else if(e.Value == 1.0f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "CrouchMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                }
+            }
+        }
+        
     }
 
     if (e.Command == "SpecialAbility") {
@@ -187,17 +360,10 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 template <typename EventContext>
 void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    m_DashEffectResetTimer += dt;
     assaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
     if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
-        if (m_DashEffectResetTimer > 0.05) {
-            Events::DashAbility e;
-            e.Player = playerID;
-            m_EventBroker->Publish(e);
-            m_DashEffectResetTimer = 0.0;
-        }
     } else {
         m_PlayerIsDashing = false;
     }
@@ -209,6 +375,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+
         Events::DashAbility e;
         e.Player = playerID;
         m_EventBroker->Publish(e);

include/Engine/Input/InputProxy.h

@@ -18,7 +18,7 @@ public:
     
     void LoadBindings(std::string file);
 	void Update(double dt);
-    void Process();
+    void Process(bool suppressNewEvents = false);
     template <typename T>
     void AddHandler();
     void Publish(const Events::InputCommand& e);

include/Engine/Network/Client.h

@@ -17,6 +17,7 @@
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
 #include "Core/EPlayerDeath.h"
@@ -29,19 +30,8 @@
 #include "Core/EAmmoPickup.h"
 #include "Network/ESearchForServers.h"
 #include "../Game/Events/EDashAbility.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
-
+#include "Network/EDisplayServerlist.h"
+#include "Network/EConnectRequest.h"
 class Client : public Network
 {
 public:
@@ -91,7 +81,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
-    size_t  receive(char* data);
+    size_t receive(char* data);
     void disconnect();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
@@ -119,6 +109,8 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
+    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -139,13 +131,15 @@ private:
     bool OnDoubleJump(Events::DoubleJump & e);
     EventRelay<Client, Events::DashAbility> m_EDashAbility;
     bool OnDashAbility(const Events::DashAbility& e);
+    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
+    bool OnConnectRequest(const Events::ConnectRequest& e);
 
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
     std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 2000; // Config I guess
+    double m_SearchingTime = 200; // Config I guess
 };
 
 #endif

include/Engine/Network/EConnectRequest.h

@@ -0,0 +1,17 @@
+#ifndef Events_ConnectRequest_h__
+#define Events_ConnectRequest_h__
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct ConnectRequest : public Event
+{
+    std::string IP = "";
+    int Port = 0;
+};
+
+}
+#endif
+

include/Engine/Network/EDisplayServerlist.h

@@ -0,0 +1,29 @@
+#ifndef Events_DisplayServerlist_h__
+#define Events_DisplayServerlist_h__
+
+#include <string>
+#include <vector>
+#include "Core/Event.h"
+
+struct ServerInfo
+{
+    ServerInfo(std::string address, int port, std::string name, int players)
+    {
+        Address = address; Port = port; Name = name; PlayersConnected = players;
+    }
+    std::string Address = "";
+    int Port = 0;
+    std::string Name = "";
+    int PlayersConnected = 0;
+};
+
+namespace Events
+{
+
+struct DisplayServerlist : public Event 
+{
+    std::vector<ServerInfo> Serverlist;
+};
+
+}
+#endif

include/Engine/Network/EKillDeath.h

@@ -0,0 +1,19 @@
+#ifndef Events_KillDeath_h__
+#define Events_KillDeath_h__
+
+#include "Core/EventBroker.h"
+
+typedef unsigned int PlayerID;
+
+namespace Events
+{
+
+struct KillDeath : public Event 
+{
+    PlayerID Casualty = -1;
+    PlayerID Killer = -1;
+};
+
+}
+
+#endif

include/Engine/Network/EPlayerConnected.h

@@ -0,0 +1,17 @@
+#ifndef Events_PlayerConnected
+#define Events_PlayerConnected
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct PlayerConnected : public Event
+{
+    std::string PlayerName = "";
+    int PlayerID = -1;
+};
+
+}
+#endif // !Events_PlayerConnected
+

include/Engine/Network/Network.h

@@ -39,6 +39,7 @@ protected:
     void logReceivedData(int bytesReceived);
     void saveToFile();
     void updateNetworkData();
+    void popNetworkSegmentOfHeader(Packet& packet);
 };
 
 #endif

include/Engine/Network/NetworkClient.h

@@ -11,7 +11,7 @@ class NetworkClient
 public:
     NetworkClient();
     virtual ~NetworkClient();
-    virtual void Connect(std::string playerName, std::string address, int port) = 0;
+    virtual bool 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;

include/Engine/Network/Packet.h

@@ -16,7 +16,9 @@ public:
     Packet(char* data, const size_t sizeOfPacket);
     Packet(MessageType type);
     ~Packet();
-    void Init(MessageType type, unsigned int& packetID);
+    void Init(MessageType type, unsigned int& packetID,
+        int groupIndex, int groupSize,
+        int packetGroup);
 
     // Add primitive types like int, float, char...
     template<typename T>
@@ -25,7 +27,8 @@ public:
         // Check if we are trying to add more than the package can fit.
         if (m_MaxPacketSize < m_Offset + sizeof(T)) {
             if (m_MaxPacketSize >= 32000) {
-                LOG_WARNING("Package::WritePrimitive(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+                // This will spam couse 8 players are over 100 000 bytes
+                //LOG_WARNING("Package::WritePrimitive(): New size is huge %i bytes\n", m_MaxPacketSize*2);
             }
             resizeData();
         }
@@ -57,13 +60,19 @@ public:
     void UpdateSize();
     char* ReadData(int SizeOfData);
     void ChangePacketID(unsigned int& packetID);
+    void ChangeGroupIndex(int groupIndex);
+    void ChangeGroupSize(int groupSize);
+    void ChangeGroup(int group);
     size_t Size() { return m_Offset; };
     char* Data() { return m_Data; };
     MessageType GetMessageType();
+    size_t Group();
     size_t DataReadSize() { return m_ReturnDataOffset; }
     size_t MaxSize() { return m_MaxPacketSize; }
     size_t HeaderSize() { return m_HeaderSize; }
-
+    size_t GroupIndex();
+    size_t GroupSize();
+    size_t PacketID();
 private:
     char* m_Data;
     size_t m_ReturnDataOffset = 0;
@@ -72,6 +81,13 @@ private:
     size_t m_HeaderSize = 0;
     void resizeData();
     void resizeData(int size);
+
+    size_t packetSizeOffset = 0;
+    size_t groupOffset = 0;
+    size_t groupIndexOffset = 0;
+    size_t groupSizeOffset = 0;
+    size_t messageTypeOffset = 0;
+    size_t packetIDOffset = 0;
 };
 
 #endif

include/Engine/Network/PlayerDefinition.h

@@ -14,6 +14,7 @@ struct PlayerDefinition {
     unsigned short TCPPort;
     // use for tcp connections
     boost::shared_ptr<boost::asio::ip::tcp::socket> TCPSocket;
+    int PacketGroup = 1;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -21,6 +21,9 @@
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 #include "Core/EAmmoPickup.h"
+#include "Core/EPlayerDeath.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EKillDeath.h"
 
 class Server : public Network
 {
@@ -57,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;
@@ -77,7 +81,8 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEntityID(EntityID entityID);
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -103,6 +108,8 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
     bool OnAmmoPickup(const Events::AmmoPickup& e);
+    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::PlayerDeath& e);
 };
 
 #endif

include/Engine/Network/TCPClient.h

@@ -10,7 +10,7 @@ public:
     TCPClient();
     ~TCPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);

include/Engine/Network/UDPClient.h

@@ -1,5 +1,7 @@
 #ifndef UDPClient_h__
 #define UDPClient_h__
+#include <map>
+#include <algorithm>
 
 #include <boost/asio.hpp>
 #include "Network/NetworkClient.h"
@@ -10,19 +12,30 @@ public:
     UDPClient();
     ~UDPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
-    void Send(Packet & packet);
+    void ReceivePackets();
+    void Send(Packet& packet);
     void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
+    // Returns false if no packets are available
+    bool GetNextPacket(Packet& packet);
 private:
+    typedef std::map<unsigned int, std::vector<std::pair<int, boost::shared_ptr<char>>>> PacketMap;
     // 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 m_LastReceivedSnapshotGroup = 0;
     int readBuffer();
+    void readPartOfPacket();
     PacketID m_SendPacketID = 0;
+    //map:(packetGroup, vector:(pair:(groupIndex, packetData)))
+    PacketMap m_PacketSegmentMap;
+    bool hasReceivedPacket(int packetGroup, int groupIndex);
+    // 2^19
+    const int m_SizeOfSocketBuffer = 524288;
 };
 
 #endif

include/Engine/Network/UDPServer.h

@@ -3,6 +3,7 @@
 
 #include "NetworkServer.h"
 #include <boost/asio/ip/udp.hpp>
+#define MAXPACKETSIZE 64000
 
 class UDPServer : public NetworkServer
 {
@@ -13,6 +14,7 @@ public:
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
+    void SendToConnectedPlayers(Packet & packet, std::map<PlayerID, PlayerDefinition>& playersTosendTo);
     void Send(Packet & packet); 
     void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
     void Broadcast(Packet & packet, int port);

include/Engine/Rendering/AnimationSystem.h

@@ -13,6 +13,8 @@
 #include "../Core/EntityWrapper.h"
 #include "Rendering/AutoBlendQueue.h"
 #include "../Input/EInputCommand.h"
+#include "../Core/EEntityDeleted.h"
+#include "Rendering/ESetBlendWeight.h"
 #include "imgui/imgui.h"
 
 class AnimationSystem : public ImpureSystem
@@ -28,6 +30,13 @@ private:
 
     EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
     bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
+
+    EventRelay<AnimationSystem, Events::EntityDeleted> m_EEntityDeleted;
+    bool OnEntityDeleted(Events::EntityDeleted& e);
+
+    EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
+    bool OnSetBlendWeight(Events::SetBlendWeight& e);
+
     std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 

include/Engine/Rendering/AutoBlendQueue.h

@@ -37,6 +37,8 @@ public:
     std::shared_ptr<BlendTree> GetBlendTree();
 
     AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
+
+    bool Empty() { return m_BlendQueue.empty(); }
 private:
      std::list<AutoblendNode> m_BlendQueue;
     

include/Engine/Rendering/BlendTree.h

@@ -62,6 +62,7 @@ public:
         double progress;
         bool Start;
         bool SingleBlend;
+        double Weight;
         std::unordered_map<EntityWrapper, double> StartWeights;
     };
 
@@ -74,7 +75,6 @@ public:
     std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
     glm::mat4 GetBoneTransform(int boneID);
     bool IsValid() { return  (m_Root == nullptr ? false : true); }
-
     void PrintTree();
     BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
 
@@ -83,16 +83,20 @@ public:
 
     EntityWrapper GetSubTreeRoot(std::string nodeName);
 
+    std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
+    std::vector<EntityWrapper> GetEntitesByName(std::string name);
+
+    void SetWeightByName(std::string name, double weight);
+
 private:
     Skeleton* m_Skeleton = nullptr;
     Node* m_Root = nullptr;
 
     std::vector<glm::mat4> m_FinalPose;
     std::map<int, glm::mat4> m_FinalBoneTransforms;
-
+    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
     std::vector<glm::mat4> AccumulateFinalPose();
     BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
-    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
 
     void Blend(std::map<int, Skeleton::PoseData>& pose);
 };

include/Engine/Rendering/BlurHUD.h

@@ -0,0 +1,70 @@
+#ifndef BlurHUD_h__
+#define BlurHUD_h__
+
+#include "IRenderer.h"
+#include "DrawBloomPassState.h"
+//#include "LightCullingPass.h" Finalpass om den skall skickas in
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+//#include "Util/UnorderedMapVec2.h"
+#include "Texture.h"
+
+class BlurHUD
+{
+public:
+    BlurHUD(IRenderer* renderer);
+    ~BlurHUD() { }
+    void InitializeTextures();
+    void InitializeFrameBuffers();
+    void InitializeShaderPrograms();
+    void InitializeBuffers();
+    void ClearBuffer();
+
+    void FillGaussianBuffer(FrameBuffer* fb);
+
+    GLuint Draw(GLuint texture, RenderScene& scene);
+
+    void OnWindowResize();
+    void FillStencil(RenderScene& scene);
+    GLuint CombineTextures(GLuint texture1, GLuint texture2);
+
+    //Getters
+    //Return the blurred result of the texture that was sent into draw
+	GLuint GaussianTexture() const { 
+		if (m_Quality == 0) { 
+			return m_BlackTexture->m_Texture;
+		} else { 
+			return m_GaussianTexture_vert;
+		} 
+	}
+
+
+private:
+    Texture* m_BlackTexture;
+    Model* m_ScreenQuad;
+
+    const IRenderer* m_Renderer;
+	ConfigFile* m_Config;
+    //const LightCullingPass* m_LightCullingPass 
+    int m_Iterations = 3;
+	int m_Quality = 0;
+    float m_BlurQuality = 4.f;
+
+    GLuint m_GaussianTexture_horiz = 0;
+    GLuint m_GaussianTexture_vert = 0;
+    GLuint m_DepthStencil_horiz = 0;
+    GLuint m_DepthStencil_vert = 0;
+    GLuint m_CombinedTexture = 0;
+
+    FrameBuffer m_GaussianFrameBuffer_horiz;
+    FrameBuffer m_GaussianFrameBuffer_vert;
+    FrameBuffer m_CombinedTextureBuffer;
+
+    ShaderProgram* m_GaussianProgram_horiz;
+    ShaderProgram* m_GaussianProgram_vert;
+    ShaderProgram* m_FillDepthStencilProgram;
+    ShaderProgram* m_CombineTexturesProgram;
+
+};
+
+#endif 

include/Engine/Rendering/CubeMapPass.h

@@ -15,7 +15,7 @@ public:
     void GenerateCubeMapTexture();
 
     //GLuint CubeMapTexture() const { return m_CubeMapTexture; }
-    GLuint m_CubeMapTexture = -1;
+    GLuint m_CubeMapTexture = 0;
 
 private:
     IRenderer* m_Renderer;

include/Engine/Rendering/DrawBloomPass.h

@@ -13,7 +13,7 @@ class DrawBloomPass
 {
 public:
     DrawBloomPass(IRenderer* renderer, ConfigFile* config);
-    ~DrawBloomPass() { }
+	~DrawBloomPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
@@ -33,12 +33,14 @@ public:
 		if (m_Quality == 0) { 
 			return m_BlackTexture->m_Texture;
 		} else { 
-			return m_GaussianTexture_vert;
+			return m_FinalGaussianTexture;
 		} 
 	}
 
 
 private:
+    void GaussianLodPass(GLuint mipMap, GLuint texture);
+    void CombineGaussianBlur();
     Texture* m_BlackTexture;
     Model* m_ScreenQuad;
 
@@ -47,15 +49,19 @@ private:
     //const LightCullingPass* m_LightCullingPass 
     int m_Iterations;
 	int m_Quality = 0;
+    int m_BloomLod = 5;
 
     GLuint m_GaussianTexture_horiz = 0;
     GLuint m_GaussianTexture_vert = 0;
+    GLuint m_FinalGaussianTexture = 0;
 
-    FrameBuffer m_GaussianFrameBuffer_horiz;
-    FrameBuffer m_GaussianFrameBuffer_vert;
+    FrameBuffer* m_GaussianFrameBuffer_horiz = nullptr;
+    FrameBuffer* m_GaussianFrameBuffer_vert = nullptr;
+    FrameBuffer m_GaussianCombineBuffer;
 
     ShaderProgram* m_GaussianProgram_horiz;
     ShaderProgram* m_GaussianProgram_vert;
+    ShaderProgram* m_GaussianCombineProgram;
 
 };
 

include/Engine/Rendering/DrawFinalPass.h

@@ -11,16 +11,18 @@
 #include "Util/UnorderedMapVec2.h"
 #include "Util/CommonFunctions.h"
 #include "Texture.h"
+#include "ShadowPass.h"
+#include "BlurHUD.h"
 
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass);
-    ~DrawFinalPass() { }
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
+	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene);
+    void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
     void ClearBuffer();
     void OnWindowResize();
 
@@ -28,6 +30,10 @@ public:
     GLuint BloomTexture() const { return m_BloomTexture; }
     //Return the texture with diffuse and lighting of the scene.
     GLuint SceneTexture() const { return m_SceneTexture; }
+    //Return the SceneTexture with the blurred HUD bits.
+    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
+    //Return the blurred scene texture.
+    GLuint FullBlurredTexture() const { return m_FullBlurredTexture; }
     //Return the framebuffer used in the scene rendering stage.
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
 
@@ -52,11 +58,13 @@ private:
 
     FrameBuffer m_FinalPassFrameBuffer;
 	FrameBuffer m_ShieldDepthFrameBuffer;
-    GLuint m_BloomTexture;
-    GLuint m_SceneTexture;
-    GLuint m_DepthBuffer;
-	GLuint m_ShieldBuffer;
-    GLuint m_CubeMapTexture;
+    GLuint m_BloomTexture = 0;
+    GLuint m_SceneTexture = 0;
+    GLuint m_DepthBuffer = 0;
+	GLuint m_ShieldBuffer = 0;
+    GLuint m_CubeMapTexture = 0;
+    GLuint m_FullBlurredTexture;
+    GLuint m_CombinedTexture; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures 
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
@@ -65,6 +73,7 @@ private:
     const LightCullingPass* m_LightCullingPass;
     const CubeMapPass* m_CubeMapPass;
 	const SSAOPass* m_SSAOPass;
+	const ShadowPass* m_ShadowPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -18,6 +18,7 @@ struct AutoAnimationBlend : Event
     bool Reverse = false;
     bool Restart = false;
     bool SingleLevelBlend = false;
+    double Weight = -1.0;
 
     EntityWrapper AnimationEntity = EntityWrapper::Invalid;
 };

include/Engine/Rendering/EResolutionChanged.h

@@ -0,0 +1,19 @@
+#ifndef EResolutionChanged_h__
+#define EResolutionChanged_h__
+
+#include "../Core/Event.h"
+#include "../Core/Util/Rectangle.h"
+
+namespace Events
+{
+
+// Fired when the framebuffer size changes
+struct ResolutionChanged : Event
+{
+    Rectangle OldResolution;
+    Rectangle NewResolution;
+};
+
+}
+
+#endif

include/Engine/Rendering/ESetBlendWeight.h

@@ -0,0 +1,20 @@
+#ifndef Events_SetBlendWeight_h__
+#define Events_SetBlendWeight_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+//Sets the blend weight for all nodes with "NodeName"
+struct SetBlendWeight : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Weight;
+};
+
+}
+
+#endif

include/Engine/Rendering/ExplosionEffectJob.h

@@ -15,8 +15,8 @@
 
 struct ExplosionEffectJob : ModelJob
 {
-    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded)
-        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded)
+    ExplosionEffectJob(ComponentWrapper explosionEffectComponent, ::Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matGroup, ComponentWrapper modelComponent, ::World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
+        : ModelJob(model, camera, matrix, matGroup, modelComponent, world, fillColor, fillPercentage, isShielded, shadow)
     {
         ExplosionOrigin = (glm::vec3)explosionEffectComponent["ExplosionOrigin"];
         TimeSinceDeath = (double)explosionEffectComponent["TimeSinceDeath"];

include/Engine/Rendering/FrameBuffer.h

@@ -7,11 +7,12 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
+    GLuint m_MipMapLod = 0;
 private:
     
 };
@@ -20,15 +21,15 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment) { }
+    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
-    Texture2D(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment) { };
+    Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
+        : ResourceType(resourceHandle, attachment, mipMapLod) { };
 
     ~Texture2D();
 };
@@ -37,12 +38,22 @@ class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
     RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment)
+        : ResourceType(resourceHandle, attachment, 0)
     { };
 
     ~RenderBuffer();
 };
 
+class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
+{
+public:
+	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
+		: ResourceType(resourceHandle, attachment, 0)
+	{ };
+
+	~Texture2DArray();
+};
+
 class FrameBuffer
 {
 public:

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums;
+    Frustum* m_Frustums = nullptr;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid;
+    LightGrid* m_LightGrid = nullptr;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex;
+    float* m_LightIndex = nullptr;
 };
 
 

include/Engine/Rendering/ModelJob.h

@@ -19,31 +19,20 @@
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
         : RenderJob()
     {
         Model = model;
 		ModelID = model->ResourceID;
 		Type = matProp.type;
 		::RawModel::MaterialBasic* matGroup = matProp.material;
+		ShaderID = matProp.ShaderID;
 		switch(matProp.type){
 		case ::RawModel::MaterialType::Basic:
-			if (Model->IsSkinned()) {
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
-			}
-			else {
-				ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
-			}
 			TextureID = 0;
 			break;
 		case ::RawModel::MaterialType::SingleTextures:
 			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusProgram")->ResourceID;
-				}
 				::RawModel::MaterialSingleTextures* singleTextures = static_cast<::RawModel::MaterialSingleTextures*>(matProp.material);
 				TextureID = (singleTextures->ColorMap.Texture) ? singleTextures->ColorMap.Texture->ResourceID : 0;
 				if (modelComponent["DiffuseTexture"]) {
@@ -65,12 +54,6 @@ struct ModelJob : RenderJob
 			break;
 		case ::RawModel::MaterialType::SplatMapping:
 			{
-				if (Model->IsSkinned()) {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapSkinnedProgram")->ResourceID;
-				}
-				else {
-					ShaderID = ResourceManager::Load<ShaderProgram>("#ForwardPlusSplatMapProgram")->ResourceID;
-				}
 				::RawModel::MaterialSplatMapping* SplatTextures = static_cast<::RawModel::MaterialSplatMapping*>(matProp.material);
 
 				SplatMap = &SplatTextures->SplatMap;
@@ -111,10 +94,11 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
+        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
+		Shadow = shadow;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
@@ -162,9 +146,13 @@ struct ModelJob : RenderJob
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
 	bool IsShielded;
+	bool Shadow;
+
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+		Hash = TextureID;
+		Hash += ModelID << 10;
+		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -52,8 +52,8 @@ private:
 
     std::unordered_map<glm::ivec2, PickingInfo> m_PickingColorsToEntity;
 
-    GLuint m_PickingTexture;
-    GLuint m_DepthBuffer;
+    GLuint m_PickingTexture = 0;
+    GLuint m_DepthBuffer = 0;
 
     FrameBuffer m_PickingBuffer;
 

include/Engine/Rendering/RawModelCustom.h

@@ -18,6 +18,7 @@
 #include "../Core/ResourceManager.h"
 #include "Texture.h"
 #include "Skeleton.h"
+#include "ShaderProgram.h"
 
 #include "boost\endian\buffers.hpp"
 
@@ -87,6 +88,7 @@ public:
 	struct MaterialProperties {
 		MaterialType type;
 		MaterialBasic* material;
+		unsigned int ShaderID = 0;
 	};
 
 	const Vertex*	Vertices() const {

include/Engine/Rendering/RenderJob.h

@@ -16,16 +16,15 @@ struct RenderJob
 public:
     float Depth;
 
+	bool operator<(const RenderJob& rhs)
+	{
+		return this->Hash < rhs.Hash;
+	}
+
 protected:
     uint64_t Hash;
 
     virtual void CalculateHash() = 0;
-
-    bool operator<(const RenderJob& rhs)
-    {
-        return this->Hash < rhs.Hash;
-    }
-
 };
 
 #endif

include/Engine/Rendering/RenderQueue.h

@@ -33,6 +33,7 @@ struct RenderScene
 
     Rectangle Viewport;
     bool ClearDepth = false;
+    bool ShouldBlur = false;
     glm::vec4 AmbientColor;
 
 	void Clear()

include/Engine/Rendering/RenderSystem.h

@@ -19,6 +19,7 @@
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
+#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -36,6 +37,8 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
+    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
+    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -18,6 +18,7 @@
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
 #include "CubeMapPass.h"
+#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -26,16 +27,22 @@
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
+#include "ShadowPass.h"
+#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
+    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
 	Renderer(EventBroker* eventBroker, ConfigFile* config)
 		: m_EventBroker(eventBroker)
 		, m_Config(config)
     { }
+	~Renderer();
+
+    virtual void SetResolution(const Rectangle& resolution) override;
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
@@ -43,7 +50,6 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
 
@@ -75,6 +81,8 @@ private:
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
     CubeMapPass* m_CubeMapPass;
+	ShadowPass* m_ShadowPass;
+    BlurHUD* m_BlurHUDPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();
@@ -85,11 +93,14 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
+    void setWindowSize(Rectangle size);
+    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-	//--------------------ShaderPrograms-------------------//
+
+    //--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/SSAOPass.h

@@ -14,7 +14,7 @@ class SSAOPass
 {
 public:
 	SSAOPass(IRenderer* renderer, ConfigFile* config);
-	~SSAOPass() { };
+	~SSAOPass();
 
 	void ChangeQuality(int quality);
 

include/Engine/Rendering/ShaderProgram.h

@@ -21,6 +21,8 @@ public:
 	std::string GetFileName() const;
 	GLuint GetHandle() const;
 	bool IsCompiled() const;
+    static std::string ReadFile(std::string fileName);
+private:
 protected:
 	GLenum m_ShaderType;
 	std::string m_FileName;

include/Engine/Rendering/ShadowPass.h

@@ -0,0 +1,88 @@
+#ifndef ShadowPass_h__
+#define ShadowPass_h__
+
+#include "IRenderer.h"
+#include "FrameBuffer.h"
+#include "ShaderProgram.h"
+#include "../Core/EventBroker.h"
+#include "../Core/World.h"
+#include "ShadowPassState.h"
+#include "imgui/imgui.h"
+
+#define MAX_SPLITS 4
+
+enum NearFar { NEAR = 0, FAR = 1 };
+enum LRBT { LEFT = 0, RIGHT = 1, BOTTOM = 2, TOP = 3 };
+
+struct ShadowFrustum
+{
+	float NearClip;
+	float FarClip;
+	float FOV;
+	float AspectRatio;
+	glm::vec3 MiddlePoint;
+	float Radius;
+	std::array<float, 4> LRBT;
+	std::array<glm::vec3, 8> CornerPoint;
+};
+
+class ShadowPass
+{
+public:
+	ShadowPass(IRenderer* renderer);
+	ShadowPass(IRenderer * renderer, int ShadowResX, int ShadowResY);
+	~ShadowPass();
+
+	void InitializeFrameBuffers();
+	void InitializeShaderPrograms();
+	void ClearBuffer();
+	void Draw(RenderScene& scene);
+
+	void DebugGUI();
+
+	GLuint DepthMap() const { return m_DepthMap; }
+	std::array<glm::mat4, MAX_SPLITS> LightP() const { return m_LightProjection; }
+	std::array<glm::mat4, MAX_SPLITS> LightV() const { return m_LightView; }
+	std::array<float, MAX_SPLITS> FarDistance() const { std::array<float, MAX_SPLITS> f; for (int i = 0; i < MAX_SPLITS; i++) f[i] = m_shadowFrusta[i].FarClip; return f; }
+	int CurrentNrOfSplits() const { return m_CurrentNrOfSplits; }
+
+	void SetSplitWeight(float split_weight) { m_SplitWeight = split_weight; };
+private:
+	void InitializeCameras(RenderScene & scene);
+	void UpdateSplitDist(std::array<ShadowFrustum, MAX_SPLITS>& frusta, float near_distance, float far_distance);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::vec3 camera_position, glm::vec3 view_dir);
+	void UpdateFrustumPoints(ShadowFrustum& frustum, glm::mat4 p, glm::mat4 v);
+
+	void PointsToLightspace(ShadowFrustum& frustum, glm::mat4 v);
+
+	float FindRadius(ShadowFrustum& frustum);
+	void RadiusToLightspace(ShadowFrustum& frustum);
+
+	EventBroker* m_EventBroker;
+	const IRenderer* m_Renderer;
+
+	GLuint m_DepthMap;
+	FrameBuffer m_DepthBuffer;
+    ShaderProgram* m_ShadowProgram;
+    ShaderProgram* m_ShadowProgramSkinned;
+
+	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
+	std::array<glm::mat4, MAX_SPLITS> m_LightView;
+
+	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
+	GLuint m_ResolutionSizeWidth = 1024 * 2;
+	GLuint m_ResolutionSizeHeight = 1024 * 2;
+
+	bool m_TransparentObjects = false;
+	bool m_TexturedShadows = false;
+	bool m_EnableShadows = true;
+
+	int m_CurrentNrOfSplits = 4;
+	float m_SplitWeight = 0.962f;
+
+	std::array<ShadowFrustum, MAX_SPLITS> m_shadowFrusta;
+
+	Texture* m_WhiteTexture = ResourceManager::Load<Texture>("Textures/Core/White.png");
+};
+
+#endif

include/Engine/Rendering/ShadowPassState.h

@@ -0,0 +1,15 @@
+#ifndef ShadowPassState_h_
+#define ShadowPassState_h_
+
+#include "Rendering/RenderState.h"
+
+class ShadowPassState : public RenderState
+{
+public:
+	ShadowPassState(GLuint frameBuffer);
+	~ShadowPassState();
+
+private:
+};
+
+#endif

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -20,18 +21,21 @@ struct SpriteJob : RenderJob
     SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
         : RenderJob()
     {
-        Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
+        Model = ResourceManager::Load<::Model>((std::string)cSprite["Model"]);
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        Linear = (bool)cSprite["Linear"];
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
 		Matrix = matrix;
         Color = cSprite["Color"];
+        BlurBackground = (bool)cSprite["BlurBackground"];
+
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
         Depth = 0;
@@ -45,6 +49,26 @@ struct SpriteJob : RenderJob
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
+
+        glm::vec3 scale = Transform::AbsoluteScale(world, cSprite.EntityID);
+
+        if((bool)cSprite["KeepRatio"] == true) {
+            if(scale.y >= scale.x) {
+                ScaleY = (scale.x)/(scale.y);
+                ScaleX = 1.f;
+            } else {
+                ScaleY = 1.f;
+                ScaleX = (scale.x)/(scale.y);
+            }
+        } else {
+            if ((bool)cSprite["KeepRatioX"] == true) {
+                ScaleX = scale.x;
+            }
+            if ((bool)cSprite["KeepRatioY"] == true) {
+                ScaleY = scale.y;
+            }
+        }
+
     };
 
     unsigned int TextureID;
@@ -65,6 +89,10 @@ struct SpriteJob : RenderJob
 
     bool Pickable;
 	bool IsIndicator = false;
+    bool BlurBackground = false;
+    float ScaleX = 1;
+    float ScaleY = 1;
+    bool Linear = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Texture.h

@@ -9,7 +9,7 @@ class Texture : public BaseTexture
 {
 	friend class ResourceManager;
 
-private:
+protected:
 	Texture(std::string path);
 
 public:

include/Engine/Rendering/TextureSprite.h

@@ -0,0 +1,26 @@
+#ifndef TextureSprite_h__
+#define TextureSprite_h__
+
+#include "../OpenGL.h"
+#include "BaseTexture.h"
+#include "Texture.h"
+#include "PNG.h"
+
+class TextureSprite : public Texture
+{
+	friend class ResourceManager;
+
+protected:
+	TextureSprite(std::string path);
+
+public:
+	~TextureSprite();
+
+	void Bind(GLenum textureUnit = GL_TEXTURE0);
+
+	GLuint m_Texture = 0;
+    unsigned char* Data = nullptr;
+    
+};
+
+#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -8,7 +8,23 @@
 
 namespace CommonFunctions
 { 
-Texture* LoadTexture(std::string path, bool threaded);
+
+//Loads Texture/SpriteTexture and return null if it fails
+template <typename T, bool threaded>
+Texture* TryLoadResource(std::string path)
+{
+    Texture* img;
+    try {
+        img = ResourceManager::Load<T, threaded>(path);
+    } catch (const Resource::StillLoadingException&) {
+        img = ResourceManager::Load<T>("Textures/Core/ErrorTexture.png");
+    } catch (const std::exception&) {
+        img = nullptr;
+    }
+
+    return img;
+}
+
 void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 void GenerateMultiSampleTexture(GLuint* texture, int numSamples, glm::vec2 dimensions, GLint internalFormat);
 void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps);

include/Engine/Rendering/Util/GLError.h

@@ -16,7 +16,11 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
+#ifdef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
+#else
+#define GLERROR(function) false
+#endif
 
 #endif

include/Game/Systems/AbilityCooldownHUDSystem.h

@@ -12,6 +12,7 @@ public:
     { }
 
     virtual void Update(double dt) override;
+private:
 };
 
 #endif

include/Game/Systems/AmmoPickupSystem.h

@@ -40,5 +40,17 @@ private:
     };
     std::vector<EntityAtMaxValuePickupStruct> m_PickupAtMaximum;
     void DoPickup(EntityWrapper &player, EntityWrapper &trigger);
+    //class
+    enum class PlayerClass {
+        Assault,
+        Defender,
+        Sniper,
+        None
+    };
+    //helper methods
+    bool DoesPlayerHaveMaxAmmo(EntityWrapper &player);
+    PlayerClass DetermineClass(EntityWrapper &player);
+    void SetPlayerAmmo(EntityWrapper &player, int ammoGain);
+    int GetPlayerMaxAmmo(EntityWrapper &player);
 };
 #endif

include/Game/Systems/CapturePointSystem.h

@@ -30,6 +30,7 @@ private:
     bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
     EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
     bool CapturePointSystem::OnCaptured(const Events::Captured& e);
+    void ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner);
 
     bool m_WinnerWasFound = false;
     //need to track these variables for the captureSystem to work as per design!

include/Game/Systems/DamageIndicatorSystem.h

@@ -15,6 +15,7 @@
 
 #include "Rendering/Util/CommonFunctions.h"
 //#define INDICATOR_TEST
+#include "Core/ConfigFile.h"
 
 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -40,6 +41,8 @@ private:
     std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
     float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
+    bool m_NetworkEnabled;
+
     //for tests
 #ifdef INDICATOR_TEST
     glm::vec3 DamageIndicatorTest(EntityWrapper player);

include/Game/Systems/MainMenuSystem.h

@@ -1,15 +1,18 @@
 #ifndef MainMenuSystem_h__
 #define MainMenuSystem_h__
 
-#include "../Core/System.h"
-#include "../Rendering/IRenderer.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/Event.h"
+#include "Core/System.h"
+#include "Rendering/IRenderer.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Systems/SpawnerSystem.h"
 
-
-#include "EButtonClicked.h"
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
+#include "GUI/EButtonClicked.h"
+#include "GUI/EButtonPressed.h"
+#include "GUI/EButtonReleased.h"
+#include "Input/EInputCommand.h"
+#include "Network/ESearchForServers.h"
+#include "Network/EConnectRequest.h"
 
 
 class MainMenuSystem : public ImpureSystem
@@ -20,6 +23,7 @@ public:
 
 private:
     IRenderer* m_Renderer;
+    void OpenSubMenu(const Events::InputCommand& e);
 
     EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
     bool OnButtonClick(const Events::ButtonClicked& e);
@@ -27,6 +31,11 @@ private:
     bool OnButtonRelease(const Events::ButtonReleased& e);
     EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
     bool OnButtonPress(const Events::ButtonPressed& e);
+    EventRelay<MainMenuSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+
+    std::string m_CurrentCommand = "";
+    EntityWrapper m_OpenSubMenu = EntityWrapper::Invalid;
 
 };
 

include/Game/Systems/PlayerDeathSystem.h

@@ -24,7 +24,10 @@ private:
     bool OnPlayerDeath(Events::PlayerDeath& e);
     EventRelay<PlayerDeathSystem, Events::EntityDeleted> m_EEntityDeleted;
     bool OnEntityDeleted(Events::EntityDeleted& e);
+    EventRelay<PlayerDeathSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(Events::InputCommand& e);
 
+    void setSpectatorCamera();
     void createDeathEffect(EntityWrapper player);
 
 };

include/Game/Systems/PlayerMovementSystem.h

@@ -30,6 +30,8 @@ private:
     bool m_LeftFoot = false;
     // To get a difference when calculating the walking state.
     glm::vec3 m_LastPosition = glm::vec3();
+    // Used to track afterimages for sprint effect.
+    float m_SprintEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt);
     // Spawn a hexagon at origin of an Entity

include/Game/Systems/PlayerSpawnSystem.h

@@ -15,10 +15,19 @@ public:
     virtual void Update(double dt) override;
 
 private:
+    // This enum must correspond to the command values for PickTeam buttons.
+    enum class PlayerClass
+    {
+        None = 0,
+        Assault,
+        Defender,
+        Sniper
+    };
     struct SpawnRequest
     {
         int PlayerID;
         ComponentInfo::EnumType Team;
+        PlayerClass Class;
     };
 
     bool m_NetworkEnabled = false;

include/Game/Systems/ScoreScreenSystem.h

@@ -0,0 +1,44 @@
+#ifndef ScoreScreenSystem_h__
+#define ScoreScreenSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/EntityFile.h"
+#include "Network/EKillDeath.h"
+#include "Core/EPlayerSpawned.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EPlayerDisconnected.h"
+#include "GLM.h"
+
+class ScoreScreenSystem : public PureSystem
+{
+public:
+    ScoreScreenSystem(SystemParams params);
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) override;
+
+    EventRelay<ScoreScreenSystem, Events::KillDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::KillDeath& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerSpawned> m_EPlayerSpawned;
+    bool OnPlayerSpawn(const Events::PlayerSpawned& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerConnected> m_EPlayerConnected;
+    bool OnPlayerConnected(const Events::PlayerConnected& e);
+    EventRelay<ScoreScreenSystem, Events::PlayerDisconnected> m_EPlayerDisconnected;
+    bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
+
+private:
+    struct PlayerData {
+        int ID = -1;
+        std::string Name = "";
+        int Team = 1;
+        int Kills = 0;
+        int Deaths = 0;
+        EntityWrapper Player = EntityWrapper::Invalid;
+    };
+
+    std::vector<int> m_DisconnectedIdentities;
+    int m_PlayerCounter = 0;
+    std::unordered_map<int, PlayerData> m_PlayerIdentities;
+};
+
+#endif

include/Game/Systems/ServerListSystem.h

@@ -0,0 +1,29 @@
+#ifndef ServerListSystem_h__
+#define ServerListSystem_h__
+
+#include "Core/System.h"
+#include "Rendering/IRenderer.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Systems/SpawnerSystem.h"
+#include "Core/EventBroker.h"
+
+#include "Network/ESearchForServers.h"
+#include "Network/EDisplayServerlist.h"
+
+class ServerListSystem : public PureSystem
+{
+public:
+    ServerListSystem(SystemParams params, IRenderer* renderer);
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cServerList, double dt) override;
+
+    void RefreshList();
+
+private:
+    IRenderer* m_Renderer;
+
+    EventRelay<ServerListSystem, Events::DisplayServerlist> m_EServerListRecieved;
+    bool OnServerListRecieved(const Events::DisplayServerlist& e);
+};
+
+#endif

include/Game/Systems/SpectatorCameraSystem.h

@@ -0,0 +1,25 @@
+#ifndef SpectatorCameraSystem_h__
+#define SpectatorCameraSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+#include "Network/EPlayerDisconnected.h"
+
+class SpectatorCameraSystem : public ImpureSystem
+{
+public:
+    SpectatorCameraSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    int m_PickedTeam;
+    bool m_CamSetToTeamPick;
+
+    EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
+    EventRelay<SpectatorCameraSystem, Events::PlayerDisconnected> m_EDisconnect;
+    bool OnDisconnect(const Events::PlayerDisconnected& e);
+};
+
+#endif

include/Game/Systems/StartSystem.h

@@ -0,0 +1,23 @@
+#ifndef StartSystem_h__
+#define StartSystem_h__
+
+#include "Core/System.h"
+#include "Core/ResourceManager.h"
+#include "Core/Event.h"
+#include "Core/EventBroker.h"
+#include "Rendering/ESetCamera.h"
+
+class StartSystem : public ImpureSystem
+{
+public:
+    StartSystem(SystemParams params);
+    virtual void Update(double dt) override;
+
+private:
+    EntityWrapper m_ActiveCamera = EntityWrapper::Invalid;
+    
+    EventRelay<StartSystem, Events::SetCamera> m_ECameraActivated;
+    bool OnCameraActivated(const Events::SetCamera& e);
+};
+
+#endif

include/Game/Systems/TextFieldReader.h

@@ -2,6 +2,8 @@
 #define AmmunitionHUDSystem_h__
 
 #include <boost/lexical_cast.hpp>
+#include <sstream>
+#include <iomanip>
 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
 

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -5,6 +5,7 @@
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
 {
@@ -20,6 +21,7 @@ public:
     void OnPrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     void OnCeasePrimaryFire(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     //bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
 

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -9,6 +9,7 @@
 #include "Systems/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 template <typename ETYPE>
 class WeaponBehaviour : public PureSystem
@@ -31,6 +32,20 @@ public:
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
+        /* EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+         EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
+         if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
+             if (m_ActiveWeapons.count(entity) == 0) {
+                 WeaponInfo& wi = m_ActiveWeapons[entity];
+                 wi.Player = entity;
+                 wi.WeaponEntity = entity;
+                 wi.FirstPersonEntity = firstPersonWeapon;
+                 wi.ThirdPersonEntity = thirdPersonWeapon;
+
+                 OnEquip(cWeapon, wi);
+             }
+         }*/
+
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
             return;
@@ -45,7 +60,9 @@ protected:
         EntityWrapper Player;
         EntityWrapper WeaponEntity;
         EntityWrapper FirstPersonEntity;
+        EntityWrapper FirstPersonPlayerModel;
         EntityWrapper ThirdPersonEntity;
+        EntityWrapper ThirdPersonPlayerModel;
     };
 
     IRenderer* m_Renderer;
@@ -73,7 +90,7 @@ protected:
 
     // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
     // if the player is in first person mode or not.
-    EntityWrapper getRelevantWeaponModelEntity(WeaponInfo& wi)
+    EntityWrapper getRelevantWeaponEntity(WeaponInfo& wi)
     {
         if (isPlayerInFirstPerson(wi.Player)) {
             return wi.FirstPersonEntity;
@@ -94,6 +111,64 @@ protected:
         }
     }
 
+    void playAnimation(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+    }
+
+    void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity;
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+
+        Events::AutoAnimationBlend eIdleBlend;
+        eIdleBlend.RootNode = root;
+        eIdleBlend.NodeName = "Idle";
+        eIdleBlend.AnimationEntity = animationNode;
+        eIdleBlend.Delay = -0.2;
+        eIdleBlend.Duration = 0.2;
+        m_EventBroker->Publish(eIdleBlend);
+    }
+
 private:
     EventRelay<ETYPE, Events::SetCamera> m_ESetCamera;
     bool _OnSetCamera(const Events::SetCamera& e)
@@ -180,6 +255,10 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
+        //if (!IsServer) {
+        //    return;
+        //}
+
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
             return;
@@ -209,8 +288,10 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        if (firstPersonAttachment.Valid()) {
-            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+        if (IsClient) {
+            if (firstPersonAttachment.Valid()) {
+                firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+            }
         }
         if (thirdPersonAttachment.Valid()) {
             thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
@@ -220,7 +301,9 @@ private:
         wi.Player = player;
         wi.WeaponEntity = player;
         wi.FirstPersonEntity = firstPersonWeapon;
+        wi.FirstPersonPlayerModel = firstPersonWeapon;
         wi.ThirdPersonEntity = thirdPersonWeapon;
+        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
         OnEquip(cWeapon, wi);
     }

resources/DefaultConfig.ini

@@ -75,7 +75,7 @@ NumIterations=9
 TextureQuality=0
 
 [GLOW]
-Quality=3;
+Quality=3
 
 [GLOW1]
 NumIterations=5

resources/DefaultInput.ini

@@ -28,4 +28,7 @@ P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
-F4=SwapToClassPick
+Comma=SwapToClassPick
+Period=SwapToTeamPick
+Enter=PickClass,1
+F5=DisconnectFromServer

resources/Schema/Components.xsd

@@ -63,4 +63,11 @@
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
 	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
 	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
+	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
+	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
+	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
+	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
+	<xs:include schemaLocation="Components/ServerList.xsd"/>
+	<xs:include schemaLocation="Components/ConfigBtnResolution.xsd"/>
+	<xs:include schemaLocation="Components/ConfigBtnFloat.xsd"/>
 </xs:schema>

resources/Schema/Components/Animation.xml

@@ -4,7 +4,7 @@
 	<Time>0</Time>
 	<Play>false</Play>
 	<Reverse>false</Reverse>
-	<Speed>0</Speed>
+	<Speed>1</Speed>
 	<Loop>true</Loop>
 	<Additive>false</Additive>
 </Animation>

resources/Schema/Components/AssaultWeapon.xml

@@ -11,10 +11,11 @@
 	<RPM>420</RPM>
 	<ViewPunch>0.03</ViewPunch>
 	<ViewReturnSpeed>0.18</ViewReturnSpeed>
-	<ReloadTime>2</ReloadTime>
+	<ReloadTime>1.65</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>
+	<ReloadQueued>false</ReloadQueued>
 	<IsReloading>false</IsReloading>
 	<ReloadTimer>0</ReloadTimer>
 	<CurrentTravel>0</CurrentTravel>

resources/Schema/Components/AssaultWeapon.xsd

@@ -44,6 +44,7 @@
 				</xs:element>
 				<xs:element name="TriggerHeld" type="t:bool" minOccurs="0"/>
 				<xs:element name="FireCooldown" type="t:double" minOccurs="0"/>
+				<xs:element name="ReloadQueued" type="t:bool" minOccurs="0"/>
 				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
 				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
 				<xs:element name="CurrentTravel" type="t:float" minOccurs="0"/>

resources/Schema/Components/Camera.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
-	<FOV>45</FOV>
+	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
 	<NearClip>0.01</NearClip>
 	<FarClip>5000</FarClip>
 </Camera>

resources/Schema/Components/ConfigBtnFloat.xml

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

resources/Schema/Components/ConfigBtnFloat.xsd

@@ -0,0 +1,22 @@
+<?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="ConfigBtnFloat">
+		<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Header" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The header of the section in config.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Field" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The name of the field to be changed in the config.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="PressValue" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The value to give the field.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ConfigBtnResolution.xml

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

resources/Schema/Components/ConfigBtnResolution.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="ConfigBtnResolution">
+		<xs:annotation><xs:documentation>Used with a Button component, this button will change a variable in the config file.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Width" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Value of the resolution width.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Height" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Value of the resolution height.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ExplosionEffect.xml

@@ -3,6 +3,8 @@
 	<ExplosionOrigin X="0" Y="0" Z="0"/>
 	<TimeSinceDeath>0</TimeSinceDeath>
 	<ExplosionDuration>2</ExplosionDuration>
+	<Speed>1</Speed>
+	<Delay>0</Delay>
 	<!--<Gravity>1</Gravity>-->
 	<!--<GravityForce>1</GravityForce>-->
 	<!--<ObjectRadius>2</ObjectRadius>-->

resources/Schema/Components/ExplosionEffect.xsd

@@ -18,6 +18,8 @@
 				<xs:element name="ExplosionDuration" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>How many seconds the death animation should be</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Speed" type="t:double" minOccurs="0"/>
+				<xs:element name="Delay" type="t:double" minOccurs="0"/>
 				<!--<xs:element name="Gravity" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Enable/disable gravity</xs:documentation></xs:annotation>
 				</xs:element>-->

resources/Schema/Components/Model.xml

@@ -8,5 +8,6 @@
 	<NormalMap>true</NormalMap>
 	<SpecularMap>true</SpecularMap>
 	<GlowMap>true</GlowMap>
-	<GlowIntensity>3.0</GlowIntensity>
+	<Shadow>true</Shadow>
+	<GlowIntensity>1.0</GlowIntensity>
 </Model>

resources/Schema/Components/Model.xsd

@@ -36,6 +36,9 @@
 				<xs:element name="GlowIntensity" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Intensity of the glow map</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Shadow" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Whether the object cast/recieve shadows or not</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/NetworkComponent.xml

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

resources/Schema/Components/NetworkComponent.xsd

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+
+	<xs:element name="NetworkComponent">
+		<xs:annotation>
+			<xs:documentation>If an entity has this component, it will be broadcasted to clients in a snapshot.</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ScoreIdentity.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ScoreIdentity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ScoreIdentity.xsd">
+	<Name></Name>
+	<ID>-1</ID>
+	<KD>0.0</KD>
+	<Kills>0</Kills>
+	<Deaths>0</Deaths>
+	<Ping>0</Ping>
+	<Connected>true</Connected>
+</ScoreIdentity>

resources/Schema/Components/ScoreIdentity.xsd

@@ -0,0 +1,32 @@
+<?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="ScoreIdentity">
+		<xs:annotation><xs:documentation>A component tracking data for the score of a player.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Name" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>A name for tracking score identities, this should be unique.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ID" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>An id for tracking identities</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="KD" type="t:double" minOccurs="0">
+				<xs:annotation><xs:documentation>The Kills per death score.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Kills" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of kills.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Deaths" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of deaths.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Ping" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Ping of a player.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Connected" type="t:bool" minOccurs="0">
+				<xs:annotation><xs:documentation>If the player is currently connected or not</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ScoreScreen.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ScoreScreen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ScoreScreen.xsd">
+	<TotalIdentities>0</TotalIdentities>
+	<NextPosition>0</NextPosition>
+	<Offset X="0.0" Y="0.0" Z="0.0"/>
+</ScoreScreen>

resources/Schema/Components/ScoreScreen.xsd

@@ -0,0 +1,20 @@
+<?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="ScoreScreen">
+		<xs:annotation><xs:documentation>The screen where player scores will be shown.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>The amount of score identities this scoreboard hold</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NextPosition" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Where the next scoreIdentity should be placed.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Offset" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ServerIdentity.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ServerIdentity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ServerIdentity.xsd">
+	<IP>123.123.123.123</IP>
+	<Port>65999</Port>
+	<ServerName>UnkownServer</ServerName>
+	<PlayersConnected>0</PlayersConnected>
+</ServerIdentity>

resources/Schema/Components/ServerIdentity.xsd

@@ -0,0 +1,23 @@
+<?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="ServerIdentity">
+		<xs:annotation><xs:documentation>A component for tracking the data of servers in the serverlist.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="IP" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>The IP adress of the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Port" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Port used to connect to the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ServerName" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>Name of the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="PlayersConnected" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Amount of players connected to the server.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ServerList.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ServerList xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ServerList.xsd">
+	<TotalIdentities>0</TotalIdentities>
+	<NextPosition>0</NextPosition>
+	<Offset X="0.0" Y="0.0" Z="0.0"/>
+</ServerList>

resources/Schema/Components/ServerList.xsd

@@ -0,0 +1,20 @@
+<?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="ServerList">
+		<xs:annotation><xs:documentation>The menulist where servers will be listed.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>The amount of server identities in this list.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NextPosition" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Where the next serverIdentity should be placed.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Offset" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ShieldAbility.xml

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

resources/Schema/Components/ShieldAbility.xsd

@@ -9,8 +9,8 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="CoolDownMaxTimer" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>This is the cooldown on shield</xs:documentation></xs:annotation>
+				<xs:element name="Active" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the shield is active or not</xs:documentation></xs:annotation>
 				</xs:element>
 			</xs:all>
 		</xs:complexType>

resources/Schema/Components/SprintAbility.xml

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

resources/Schema/Components/SprintAbility.xsd

@@ -12,6 +12,9 @@
 				<xs:element name="StrengthOfEffect" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>This is the strength of the sprint effect</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Active" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>True if currently sprinting.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Sprite.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Sprite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Sprite.xsd">
+	<Model>Models/Core/UnitQuad.mesh</Model>
 	<DiffuseTexture></DiffuseTexture>
 	<GlowMap></GlowMap>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<DepthSort>true</DepthSort>
+	<KeepRatioX>false</KeepRatioX>
+	<KeepRatioY>false</KeepRatioY>
+	<KeepRatio>false</KeepRatio>
+	<Linear>true</Linear>
+	<BlurBackground>false</BlurBackground>
 </Sprite>

resources/Schema/Components/Sprite.xsd

@@ -9,14 +9,17 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
+				<xs:element name="Model" type="t:string" minOccurs="0">
+					<xs:annotation><xs:documentation>The model the sprite will use.</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="DiffuseTexture" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>Diffuse Texture file</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Diffuse Texture file.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="GlowMap" type="t:string" minOccurs="0">
-					<xs:annotation><xs:documentation>GlowMap file</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>GlowMap file.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Color" type="t:Color" minOccurs="0">
-					<xs:annotation><xs:documentation>Color tint</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Color tint.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Visible" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the model is visible or not</xs:documentation></xs:annotation>
@@ -24,6 +27,21 @@
 				<xs:element name="DepthSort" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="KeepRatioX" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Wether the sprite should repeat in x instead of stretch when scaled.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="KeepRatioY" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Wether the sprite should repeat in y instead of stretch when scaled.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="KeepRatio" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Keep a 1:1 ratio between X and Y.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Linear" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If it should use Linear or Nearest sampling method.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="BlurBackground" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Wether the background should be blurred begind this sprite.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

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

@@ -2,6 +2,7 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:NetworkComponent/>
     <c:AmmoPickup/>
     <c:Model>
       <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>

resources/Schema/Entities/AmmoPickupWithModel.xml

@@ -0,0 +1,38 @@
+<?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/PickUps/PickUpHolder.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-4.20782185" Y="7.18348074" Z="-51.9578781"/>
+      <Scale X="0.5" Y="0.5" Z="0.5"/>
+      <Orientation X="0" Y="0.324000001" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AmmoPickup/>
+        <c:Model>
+          <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+        </c:Model>
+        <c:RaptorCopter>
+          <Speed>8</Speed>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="2.36784196" Z="0"/>
+          <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
+          <Orientation X="0" Y="72.7095108" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>