spawning 1 shield on server and one on client

Conflicts:
	assets

include/Engine/Core/ECaptured.h

@@ -1,5 +1,5 @@
-#ifndef ECaptured_h__
-#define ECaptured_h__
+#ifndef Events_Captured_h__
+#define Events_Captured_h__
 
 #include "EventBroker.h"
 #include "../Core/Entity.h"

include/Engine/Core/PerformanceTimer.h

@@ -2,8 +2,11 @@
 #define PerformanceTimer_h__
 
 #include "../Common.h"
+
+#ifdef DEBUG
 #include <boost/timer/timer.hpp>
 using boost::timer::cpu_timer;
+#endif //DEBUG
 
 class PerformanceTimer
 {
@@ -17,9 +20,11 @@ public:
     static void CreateExcelData();
 
 private:
+#ifdef DEBUG
     static std::map<std::string, cpu_timer> timers;
     static cpu_timer m_Timer;
     static std::string currentTimerRunning;
+#endif //DEBUG
 };
 
 #endif

include/Engine/Core/System.h

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

include/Engine/Input/FirstPersonInputController.h

@@ -166,6 +166,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                             aeb.Duration = 0.1;
                             aeb.NodeName = "Run";
                             aeb.RootNode = firstPersonModel;
+                            aeb.SingleLevelBlend = true;
                             aeb.Start = true;
                             m_EventBroker->Publish(aeb);
                         }
@@ -175,6 +176,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                             aeb.Duration = 0.1;
                             aeb.NodeName = "Run";
                             aeb.RootNode = firstPersonModel;
+                            aeb.SingleLevelBlend = true;
                             aeb.Start = true;
                             aeb.Reverse = true;
                             m_EventBroker->Publish(aeb);
@@ -210,14 +212,40 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                         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.SingleLevelBlend = true;
+                            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.SingleLevelBlend = true;
+                            aeb.Start = true;
+                            aeb.Reverse = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    }
+                }
             }
         }
     }
 
-    //Animation
-    if (glm::length2(m_Movement) < 0.25f) {
-        //Blend to Idle
     if (m_PlayerEntity.Valid()) {
+        glm::vec2 movementXZ = glm::vec2(m_Movement.x, m_Movement.z);
+        if (glm::length(movementXZ) < 0.1f) {
+            //Blend to Idle
             EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
             if (playerModel.Valid()) {
                 Events::AutoAnimationBlend aeb;
@@ -236,10 +264,8 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                 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;
@@ -251,8 +277,7 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         }
     }
 
-
-    if (glm::length2(m_Movement) > 0) {
+    if (glm::length(m_Movement) > 0) {
         m_Movement = glm::normalize(m_Movement);
 
         //Animation

include/Engine/Network/Client.h

@@ -10,28 +10,34 @@
 #include <boost/asio.hpp>
 #include <boost/shared_array.hpp>
 
+#include "Network/EKillDeath.h"
+#include "Core/World.h"
+#include "Core/EntityFile.h"
+#include "Core/EventBroker.h"
+#include "Core/ConfigFile.h"
+#include "Core/EPlayerDeath.h"
+#include "Core/EPlayerDamage.h"
+#include "Core/EPlayerSpawned.h"
+#include "Core/EAmmoPickup.h"
+#include "Game/Events/EDoubleJump.h"
+#include "Game/Events/EDashAbility.h"
+#include "Game/Events/EReset.h"
+#include "Input/EInputCommand.h"
+#include "imgui/imgui.h"
 #include "Network/Network.h"
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Network/UDPClient.h"
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
-#include "Core/World.h"
-#include "Core/EntityFile.h"
-#include "Core/EventBroker.h"
-#include "Core/ConfigFile.h"
-#include "Core/EPlayerDeath.h"
-#include "Input/EInputCommand.h"
-#include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
-#include "Network/EInterpolate.h"
-#include "Network/SnapshotFilter.h"
-#include "Core/EPlayerSpawned.h"
-#include "Core/EAmmoPickup.h"
-#include "Network/ESearchForServers.h"
-#include "../Game/Events/EDashAbility.h"
 #include "Network/EDisplayServerlist.h"
 #include "Network/EConnectRequest.h"
+#include "Network/EPlayerDisconnected.h"
+#include "Network/ESearchForServers.h"
+#include "Network/EInterpolate.h"
+#include "Network/SnapshotFilter.h"
+#include "Core/EWin.h"
+
 class Client : public Network
 {
 public:
@@ -40,7 +46,7 @@ public:
     ~Client();
 
     void Connect(std::string address, int port);
-    void Update() override;
+    void Update(double dt) override;
 private:
     UDPClient m_Unreliable;
     TCPClient m_Reliable;
@@ -74,10 +80,10 @@ private:
     // Network logic
     PlayerDefinition m_PlayerDefinitions[8];
     SnapshotDefinitions m_NextSnapshot;
-    double m_DurationOfPingTime;
-    std::clock_t m_StartPingTime;
-    std::clock_t m_TimeSinceSentInputs;
-    unsigned int m_SendInputIntervalMs;
+    double m_DurationOfPingTime = 0;
+    double m_StartPingTime = 0;
+    double m_TimeSinceSentInputs = 0;
+    double m_SendInputInterval = 0.033;
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
@@ -100,6 +106,9 @@ private:
     void parseDoubleJump(Packet& packet);
     void parseDashEffect(Packet& packet);
     void parseAmmoPickup(Packet& packet);
+    void parseRemoveWorld(Packet& packet);
+    void parseKDEvent(Packet& packet);
+    void parseWin(Packet& packet);
     void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();
@@ -109,7 +118,6 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
-    void removeWorld();
     void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
@@ -138,8 +146,8 @@ private:
     UDPClient m_ServerlistRequest;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
-    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 200; // Config I guess
+    double m_TimeSearched = 0;
+    double m_SearchingTime = 0.2; // Config I guess
 };
 
 #endif

include/Engine/Network/EKillDeath.h

@@ -10,8 +10,19 @@ namespace Events
 
 struct KillDeath : public Event 
 {
+    int CasualtyTeam;
     PlayerID Casualty = -1;
+    std::string CasualtyName;
+
+    //1 = assault, 2 = defender, 3 = sniper
+    int CasualtyClass;
+
+    int KillerTeam;
     PlayerID Killer = -1;
+    std::string KillerName;
+
+    //1 = assault, 2 = defender, 3 = sniper
+    int KillerClass;
 };
 
 }

include/Engine/Network/MessageType.h

@@ -23,6 +23,9 @@ enum class MessageType
     OnDashEffect,
     ServerlistRequest,
     AmmoPickup,
+    RemoveWorld,
+    KD,
+    Win,
     Invalid
 };
 

include/Engine/Network/Network.h

@@ -22,7 +22,7 @@ public:
     Network(World* world, EventBroker* eventBroker);
     virtual ~Network() { };
 
-    virtual void Update() = 0;
+    virtual void Update(double dt) = 0;
 
 protected:
     World* m_World;
@@ -40,6 +40,7 @@ protected:
     void saveToFile();
     void updateNetworkData();
     void popNetworkSegmentOfHeader(Packet& packet);
+    void removeWorld();
 };
 
 #endif

include/Engine/Network/Server.h

@@ -11,6 +11,7 @@
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "../Network/Network.h"
 #include "Input/EInputCommand.h"
@@ -24,6 +25,8 @@
 #include "Core/EPlayerDeath.h"
 #include "Network/EPlayerConnected.h"
 #include "Network/EKillDeath.h"
+#include "Core/EWin.h"
+#include "Game/Events/EReset.h"
 
 class Server : public Network
 {
@@ -31,7 +34,7 @@ public:
     Server(World* world, EventBroker* eventBroker, int port);
     ~Server();
 
-    void Update() override;
+    void Update(double dt) override;
 
 private:
     // Network channels
@@ -41,6 +44,7 @@ private:
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
+    bool m_GameIsOver = false;
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
     std::vector<PlayerID> m_PlayersToDisconnect;
@@ -48,14 +52,14 @@ private:
     char readBuffer[BUFFERSIZE] = { 0 };
     size_t bytesRead = 0;
     // time for previouse message
-    std::clock_t previousePingMessage = std::clock();
-    std::clock_t previousSnapshotMessage = std::clock();
-    std::clock_t timOutTimer = std::clock();
+    double previousPingMessage = 0;
+    double previousSnapshotMessage = 0;
+    double timeOutTimer = 0;
 
-    // How often we send messages (milliseconds)
-    float pingIntervalMs;
-    float snapshotInterval;
-    int checkTimeOutInterval = 100;
+    // How often we send messages (seconds)
+    double pingInterval = 1;
+    double snapshotInterval = 0.05;
+    double checkTimeOutInterval = 0.1;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
@@ -71,6 +75,7 @@ private:
     void reliableBroadcast(Packet& packet);
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
+    void createWorldSnapshot(Packet& packet);
     void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
@@ -83,6 +88,7 @@ private:
     void kick(PlayerID player);
     PlayerID getPlayerIDFromEndpoint();
     PlayerID getPlayerIDFromEntityID(EntityID entityID);
+    void resetMap();
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -110,6 +116,8 @@ private:
     bool OnAmmoPickup(const Events::AmmoPickup& e);
     EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
     bool OnPlayerDeath(const Events::PlayerDeath& e);
+    EventRelay<Server, Events::Win> m_EWin;
+    bool OnWin(const Events::Win& e);
 };
 
 #endif

include/Engine/Rendering/BlendTree.h

@@ -49,9 +49,7 @@ public:
                     next = next->Child[0];
                 }
             }
-
             return next;
-
         }
     };
 
@@ -82,6 +80,7 @@ public:
     BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
 
     EntityWrapper GetSubTreeRoot(std::string nodeName);
+    std::vector<EntityWrapper> GetSubTreeRoots(std::string nodeName);
 
     std::vector<EntityWrapper> GetSingleLevelRoots(std::string name);
     std::vector<EntityWrapper> GetEntitesByName(std::string name);

include/Engine/Rendering/DDS.h

@@ -0,0 +1,71 @@
+#ifndef DDS_h__
+#define DDS_h__
+
+#include <cstdint>
+
+#include "../Common.h"
+#include "../Core/ResourceManager.h"
+#include "Image.h"
+
+// DXT5
+class DDS : public Image, public Resource
+{
+public:
+    DDS(std::string path);
+    ~DDS();
+
+    void FlipY(unsigned char* data, std::size_t rowBytes, std::size_t totalSize, std::size_t numBlocksWide);
+
+private:
+    static const uint32_t MagicNumber = 0x20534444; // "DDS "
+
+    struct Header_t
+    {
+        uint32_t Size;
+        uint32_t Flags;
+        uint32_t Height;
+        uint32_t Width;
+        uint32_t PitchOrLinearSize;
+        uint32_t Depth;
+        uint32_t MipMapCount;
+        uint32_t RESERVED1[11];
+        struct PixelFormat_t
+        {
+            uint32_t Size;
+            uint32_t Flags;
+            uint32_t FourCC;
+            uint32_t RGBBitCount;
+            uint32_t RBitMask;
+            uint32_t GBitMask;
+            uint32_t BBitMask;
+            uint32_t ABitMask;
+        } PixelFormat;
+        uint32_t Caps;
+        uint32_t Caps2;
+        uint32_t Caps3;
+        uint32_t Caps4;
+        uint32_t RESERVED2;
+    } m_Header;
+
+    struct Block_t
+    {
+        struct Alpha_t
+        {
+            uint8_t Colors[2];
+            uint8_t Data[6];
+        } Alpha;
+        struct Data_t
+        {
+            uint16_t Colors[2];
+            uint8_t Data[4];
+        } Data;
+    };
+
+    std::size_t m_NumBlocksWide;
+    std::size_t m_NumBlocksHigh;
+    std::size_t m_RowBytes;
+
+    void flipBlock(Block_t* block);
+};
+
+#endif

include/Engine/Rendering/DrawFinalPass.h

@@ -17,7 +17,7 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass, ConfigFile* config);
 	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
@@ -25,17 +25,77 @@ public:
     void Draw(RenderScene& scene, BlurHUD* blurHUDPass);
     void ClearBuffer();
     void OnWindowResize();
+	void setMSAA(unsigned int numberOfSamples);
 
     //Return the texture that is used in later stages to apply the bloom effect
-    GLuint BloomTexture() const { return m_BloomTexture; }
+	GLuint BloomTexture() {
+		if (m_MSAA){
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			glReadBuffer(GL_COLOR_ATTACHMENT1);
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_BloomTexture; }
     //Return the texture with diffuse and lighting of the scene.
-    GLuint SceneTexture() const { return m_SceneTexture; }
+	GLuint DrawFinalPass::SceneTexture() {
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			glReadBuffer(GL_COLOR_ATTACHMENT0);
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_SceneTexture;
+	}
     //Return the SceneTexture with the blurred HUD bits.
-    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
+    GLuint CombinedSceneTexture() {
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_CombinedTexture; }
     //Return the blurred scene texture.
-    GLuint FullBlurredTexture() const { return m_FullBlurredTexture; }
+    GLuint FullBlurredTexture() { 
+		if (m_MSAA) {
+			m_AntiAliasedFrameBuffer->Bind();
+			glClearColor(0.f, 0.f, 0.f, 0.f);
+			glClear(GL_COLOR_BUFFER_BIT);
+			m_AntiAliasedFrameBuffer->Unbind();
+			m_FinalPassFrameBuffer->Read();
+			m_AntiAliasedFrameBuffer->Draw();
+			glBlitFramebuffer(
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				0, 0, m_Renderer->GetViewportSize().Width, m_Renderer->GetViewportSize().Height,
+				GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			return m_AntiAliasedTexture;
+		}
+		return m_FullBlurredTexture; }
     //Return the framebuffer used in the scene rendering stage.
-    FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
+    FrameBuffer* FinalPassFrameBuffer() { return m_FinalPassFrameBuffer; }
 
 private:
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
@@ -56,18 +116,21 @@ private:
     Texture* m_GreyTexture;
     Texture* m_ErrorTexture;
 
-    FrameBuffer m_FinalPassFrameBuffer;
-	FrameBuffer m_ShieldDepthFrameBuffer;
+    FrameBuffer* m_FinalPassFrameBuffer = nullptr;
+	FrameBuffer* m_ShieldDepthFrameBuffer = nullptr;
+	FrameBuffer* m_AntiAliasedFrameBuffer = nullptr;
     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 
+    GLuint m_FullBlurredTexture = 0;
+    GLuint m_CombinedTexture = 0; //This can be removed for less memory usage, just set m_sceneTexture to the return from m_BlurHUDPass.CombineTextures
+	GLuint m_AntiAliasedTexture = 0; //Is only used when MSAA is active;
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
+	unsigned int m_MSAA = 0;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;

include/Engine/Rendering/FrameBuffer.h

@@ -7,12 +7,13 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod, bool multiSampling);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
     GLuint m_MipMapLod = 0;
+	bool m_MultiSampling = false;
 private:
     
 };
@@ -21,24 +22,33 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
+    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod, bool multiSampling)
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod, multiSampling) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
     Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
-        : ResourceType(resourceHandle, attachment, mipMapLod) { };
+        : ResourceType(resourceHandle, attachment, mipMapLod, false) { };
 
     ~Texture2D();
 };
 
+class Texture2DMultiSample : public ResourceType<GL_TEXTURE_2D_MULTISAMPLE>
+{
+public:
+	Texture2DMultiSample(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
+		: ResourceType(resourceHandle, attachment, mipMapLod, true) { };
+
+	~Texture2DMultiSample();
+};
+
 class RenderBuffer : public ResourceType<GL_RENDERBUFFER>
 {
 public:
-    RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, 0)
+    RenderBuffer(GLuint* resourceHandle, GLenum attachment, bool multiSampling = false)
+        : ResourceType(resourceHandle, attachment, 0, multiSampling)
     { };
 
     ~RenderBuffer();
@@ -48,12 +58,13 @@ class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
 {
 public:
 	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
-		: ResourceType(resourceHandle, attachment, 0)
+		: ResourceType(resourceHandle, attachment, 0, false)
 	{ };
 
 	~Texture2DArray();
 };
 
+
 class FrameBuffer
 {
 public:
@@ -65,9 +76,13 @@ public:
     void Generate();
     void Bind();
     void Unbind();
+	void Read();
+	void Draw();
     GLuint GetHandle();
+	bool MultiSampling() { return m_MultiSampling; };
 
 private:
+	bool m_MultiSampling = true;
     GLuint m_BufferHandle;
     std::vector<std::shared_ptr<BufferResource>> m_Resources;
 };

include/Engine/Rendering/Image.h

@@ -15,7 +15,10 @@ struct Image
 	unsigned int Width = 0;
 	unsigned int Height = 0;
 	ImageFormat Format = ImageFormat::Unknown;
+    unsigned int MipMapLevels = 0;
+    bool Compressed = false;
 	unsigned char* Data = nullptr;
+    std::size_t ByteSize = 0;
 };
 
 #endif

include/Engine/Rendering/Model.h

@@ -17,8 +17,8 @@ private:
 public:
 	~Model();
     const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_Materials; }
-    //const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
 	unsigned int NumberOfVertices() const { return m_Vertices.size(); }
+
     const AABB& Box() const { return m_Box; }
 	bool IsSkinned() const { return m_IsSkinned; }
 	GLuint VAO;

include/Engine/Rendering/ModelJob.h

@@ -104,13 +104,18 @@ struct ModelJob : RenderJob
         FillPercentage = fillPercentage;
 		IsShielded = isShielded;
 
+        
+        if (world->HasComponent(Entity, "Unpickable")) {
+            NotPickable = true;
+        }
+
         if (model->IsSkinned()) {
             Skeleton = Model->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                
                 EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
                 
+
                 if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
                     BlendTree = Skeleton->BlendTrees.at(entityWrapper);
                 }
@@ -147,6 +152,7 @@ struct ModelJob : RenderJob
     float FillPercentage = 0.0;
 	bool IsShielded;
 	bool Shadow;
+    bool NotPickable = false;
 
     void CalculateHash() override
     {

include/Engine/Rendering/RawModelCustom.h

@@ -31,8 +31,7 @@ protected:
 public:
     ~RawModelCustom();
 
-	struct Vertex
-	{
+	struct RenderVertex {
 		glm::vec3 Position;
 		glm::vec3 Normal;
 		glm::vec3 Tangent;
@@ -40,7 +39,7 @@ public:
 		glm::vec2 TextureCoords;
 	};
 
-    struct SkinedVertex : public Vertex {
+    struct SkinedVertex : public RenderVertex {
         glm::vec4 BoneIndices;
         glm::vec4 BoneWeights;
     };
@@ -88,7 +87,7 @@ public:
 		unsigned int ShaderID = 0;
 	};
 
-	const Vertex*	Vertices() const {
+	const RenderVertex* Vertices() const {
 		if (hasSkin) { 
 			return m_SkinedVertices.data(); 
 		} else {
@@ -101,11 +100,11 @@ public:
 			return sizeof(SkinedVertex);
 		}
 		else {
-			return sizeof(Vertex);
+			return sizeof(RenderVertex);
 		}
 	};
 
-	unsigned int	NumVertices() const {
+	size_t NumVertices() const {
 		if (hasSkin) {
 			return m_SkinedVertices.size();
 		} else {
@@ -113,17 +112,39 @@ public:
 		}
 	};
 
+	const std::vector<unsigned int>& Indices() const {
+		return m_Indices;
+	}
+
 	bool IsSkinned() const { return hasSkin; };
 
+	const std::vector<glm::vec3>& CollisionVertices();
+
+	size_t NumCollisionVertices() const {
+		return m_CollisionVertices.size();
+	};
+
+	const std::vector<unsigned int>& CollisionIndices() const {
+		if (hasCollisionMesh) {
+			return m_CollisionIndices;
+		} else {
+			return m_Indices;
+		}
+	};
+
 	std::vector<MaterialProperties> m_Materials;
 
-    std::vector<unsigned int> m_Indices;
+    
     Skeleton* m_Skeleton = nullptr;
     glm::mat4 m_Matrix;
 
 private:
    	bool hasSkin;
-	std::vector<Vertex> m_Vertices;
+	bool hasCollisionMesh = false;
+	std::vector<unsigned int> m_Indices;
+	std::vector<unsigned int> m_CollisionIndices;
+	std::vector<glm::vec3> m_CollisionVertices;
+	std::vector<RenderVertex> m_Vertices;
 	std::vector<SkinedVertex> m_SkinedVertices;
 
     void ReadMeshFile(std::string filePath);
@@ -147,6 +168,11 @@ private:
     void ReadAnimationClipSingle(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, unsigned int clipIndex);
     void ReadAnimationKeyFrame(std::size_t& offset, char* fileData, const unsigned int& fileByteSize, std::vector<Skeleton::Animation::Keyframe>& animation);
 
+
+	void ReadCollisionFile(std::string filePath);
+	void ReadCollisionFileData(std::size_t& offset, char* fileData, const unsigned int& fileByteSize);
+
+	const std::vector<glm::vec3>& ConstructCollisionList();
     //void CreateSkeleton(std::vector<std::tuple<std::string, glm::mat4>> &boneInfo, std::map<std::string, int> &boneNameMapping, aiNode* node, int parentID);
 };
 

include/Engine/Rendering/Renderer.h

@@ -71,6 +71,7 @@ private:
     bool m_ResizeWindow = false;
 	int m_SSAO_Quality = 0;
 	int m_GLOW_Quality = 2;
+	unsigned int m_MSAA_Level = 0;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;

include/Engine/Rendering/Skeleton.h

@@ -20,11 +20,14 @@ public:
 			, Parent(parent)
 			, Name(name)
 			, OffsetMatrix(offsetMatrix)
-		{ }
+		{
+			BindTransformMatrix = glm::inverse(offsetMatrix);
+		}
 
 		std::string Name;
 		glm::mat4 OffsetMatrix;
         int ID;
+		glm::mat4 BindTransformMatrix;
 
 		Bone* Parent;
 		std::vector<Bone*> Children;

include/Engine/Rendering/SpriteJob.h

@@ -21,7 +21,7 @@ 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>((std::string)cSprite["Model"]);
+        Model = ResourceManager::Load<::Model>(cSprite["Model"]);
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
@@ -29,6 +29,7 @@ struct SpriteJob : RenderJob
         IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         Linear = (bool)cSprite["Linear"];
+		ClampToBorder = (bool)cSprite["ClampToBorder"];
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
@@ -54,7 +55,7 @@ struct SpriteJob : RenderJob
 
         if((bool)cSprite["KeepRatio"] == true) {
             if(scale.y >= scale.x) {
-                ScaleY = (scale.x)/(scale.y);
+                ScaleY = (scale.y)/(scale.x);
                 ScaleX = 1.f;
             } else {
                 ScaleY = 1.f;
@@ -90,9 +91,10 @@ struct SpriteJob : RenderJob
     bool Pickable;
 	bool IsIndicator = false;
     bool BlurBackground = false;
-    float ScaleX = 1;
-    float ScaleY = 1;
+    float ScaleX = 1.f;
+    float ScaleY = 1.f;
     bool Linear = false;
+	bool ClampToBorder = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Texture.h

@@ -1,9 +1,11 @@
 #ifndef Texture_h__
 #define Texture_h__
 
+#include <boost/filesystem.hpp>
 #include "../OpenGL.h"
 #include "BaseTexture.h"
 #include "PNG.h"
+#include "DDS.h"
 
 class Texture : public BaseTexture
 {
@@ -18,8 +20,9 @@ public:
 	void Bind(GLenum textureUnit = GL_TEXTURE0);
 
 	GLuint m_Texture = 0;
-    unsigned char* Data = nullptr;
 
+	enum TextureType : GLint { cInvalid = 0, cDDS = 1, cPNG = 2};
+	TextureType m_Type;
 };
 
 #endif

include/Engine/Rendering/TextureSprite.h

@@ -14,11 +14,6 @@ protected:
 	TextureSprite(std::string path);
 
 public:
-	void Bind(GLenum textureUnit = GL_TEXTURE0);
-
-	GLuint m_Texture = 0;
-    unsigned char* Data = nullptr;
-    
 };
 
 #endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -27,7 +27,7 @@ Texture* TryLoadResource(std::string path)
 
 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);
+void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type, GLint numMipMaps, GLint MAGFilter, GLint MINFilter);
 void DeleteTexture(GLuint* texture);
 };
 

include/Engine/Sound/SoundManager.h

@@ -30,6 +30,7 @@
 #include "../Engine/Core/EPause.h"
 #include "../Engine/Core/EComponentAttached.h"
 #include "../Core/EPlayerSpawned.h"
+#include "../Rendering/ESetCamera.h"
 
 
 typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;
@@ -80,6 +81,7 @@ private:
     void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
     float getDurationSeconds(Source* source);
     float getTimeOffsetSeconds(Source* source);
+    void setTimeOffsetSeconds(Source* source, float timeOffset);
 
     // Specific logic
     void playSound(Source* source);
@@ -91,7 +93,6 @@ private:
     void matchBGMLoop();
     Source* m_CurrentBGM = nullptr;
     Source* m_CurrentBGMCombo = nullptr;
-    bool m_DrumLoopHasBeenStarted = false;
 
     // Logic
     World* m_World = nullptr;
@@ -139,6 +140,8 @@ private:
     bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
     EventRelay<SoundManager, Events::ChangeBGM> m_EChangeBGM;
     bool OnChangeBGM(const Events::ChangeBGM &e);
+    EventRelay<SoundManager, Events::SetCamera> m_ESetCamera;
+    bool OnSetCamera(const Events::SetCamera& e);
 
 
 };

include/Game/Events/EReset.h

@@ -0,0 +1,16 @@
+#ifndef Events_Reset_h__
+#define Events_Reset_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct Reset : Event
+{
+};
+
+}
+
+#endif

include/Game/Systems/BoostSystem.h

@@ -6,6 +6,7 @@
 #include "Core/EntityFile.h"
 #include "Core/EPlayerDamage.h"
 #include "Common.h"
+#include "SpawnerSystem.h"
 
 class BoostSystem : public System
 {
@@ -17,5 +18,7 @@ private:
     bool OnPlayerDamage(Events::PlayerDamage& e);
 
     std::string DetermineClass(EntityWrapper player);
+
+    void giveAmmo(EntityWrapper giver, EntityWrapper receiver);
 };
 #endif

include/Game/Systems/CapturePointSystem.h

@@ -9,6 +9,7 @@
 #include "Engine/Collision/ETrigger.h"
 #include "Core/ECaptured.h"
 #include "Core/EWin.h"
+#include "Game/Events/EReset.h"
 
 #include <tuple>
 #include <vector>
@@ -23,6 +24,7 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
 
 private:
+    void Init();
     //methods which will take care of specific events
     EventRelay<CapturePointSystem, Events::TriggerTouch> m_ETriggerTouch;
     bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e);
@@ -30,6 +32,8 @@ private:
     bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
     EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
     bool CapturePointSystem::OnCaptured(const Events::Captured& e);
+    EventRelay<CapturePointSystem, Events::Reset> m_EReset;
+    bool CapturePointSystem::OnReset(const Events::Reset& e);
     void ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner);
 
     bool m_WinnerWasFound = false;

include/Game/Systems/EndScreenSystem.h

@@ -0,0 +1,21 @@
+#ifndef EndScreenSystem_h__
+#define EndScreenSystem_h__
+
+#include "Core/System.h"
+#include "Input/EInputCommand.h"
+#include "Rendering/ESetCamera.h"
+#include "Core/EWin.h"
+
+class EndScreenSystem : public ImpureSystem
+{
+public:
+    EndScreenSystem(SystemParams params);
+
+    virtual void Update(double dt) override;
+
+private:
+    EventRelay<EndScreenSystem, Events::Win> m_EWin;
+    bool OnWin(const Events::Win& e);
+};
+
+#endif

include/Game/Systems/FadeSystem.h

@@ -0,0 +1,22 @@
+#ifndef FadeSystem_h__
+#define FadeSystem_h__
+
+#include "Core/System.h"
+#include "GLM.h"
+
+class FadeSystem : public PureSystem
+{
+public:
+    FadeSystem(SystemParams params)
+        : System(params)
+        , PureSystem("Fade")
+    {
+
+    }
+
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFadeOut, double dt) override;
+
+private:
+};
+
+#endif

include/Game/Systems/KillFeedSystem.h

@@ -3,7 +3,7 @@
 
 #include "../../Engine/Core/System.h"
 #include "../../Engine/GLM.h"
-#include "Core/EPlayerDeath.h"
+#include "Network/EKillDeath.h"
 
 class KillFeedSystem : public ImpureSystem
 {
@@ -11,8 +11,7 @@ public:
     KillFeedSystem(SystemParams params)
         : System(params)
     {
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
-
+        EVENT_SUBSCRIBE_MEMBER(m_EKillDeath, &KillFeedSystem::OnPlayerKillDeath)
     }
 
     virtual void Update(double dt) override;
@@ -22,16 +21,30 @@ private:
 
 
 
-    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
-    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
+    EventRelay<KillFeedSystem, Events::KillDeath> m_EKillDeath;
+    bool KillFeedSystem::OnPlayerKillDeath(Events::KillDeath& e);
 
     struct KillFeedInfo
     {
-        std::string Content;
-        glm::vec4 Color;
+        std::string KillerName = "";
+        int KillerClass = 0;
+        int KillerID = -1;
+        int KillerTeam = 0;
+        std::string KillerColor = "";
+
+        std::string VictimName = "";
+        int VictimClass = 0;
+        int VictimID = -1;
+        int VictimTeam = 0;
+        std::string VictimColor = "";
+
+        bool redused;
         float TimeToLive = 5.f;
     };
 
+    std::string m_RedColor = "\\C08366D";
+    std::string m_BlueColor = "\\C6A1208";
+
     std::list<KillFeedInfo> m_DeathQueue;
 
 };

include/Game/Systems/MainMenuSystem.h

@@ -13,6 +13,7 @@
 #include "Input/EInputCommand.h"
 #include "Network/ESearchForServers.h"
 #include "Network/EConnectRequest.h"
+#include <stdlib.h>
 
 
 class MainMenuSystem : public ImpureSystem

include/Game/Systems/PlayerMovementSystem.h

@@ -32,6 +32,8 @@ private:
     glm::vec3 m_LastPosition = glm::vec3();
     // Used to track afterimages for sprint effect.
     float m_SprintEffectTimer;
+    // Used to track afterimages for dash effect.
+    float m_DashEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt, EntityWrapper player);
     // Spawn a hexagon at origin of an Entity
@@ -46,4 +48,6 @@ private:
 
     void updateMovementControllers(double dt);
     void updateVelocity(EntityWrapper player, double dt);
+
+    void setAim(EntityWrapper root, std::string weaponNodeName, double time);
 };

include/Game/Systems/PlayerSpawnSystem.h

@@ -19,9 +19,9 @@ private:
     enum class PlayerClass
     {
         None = 0,
-        Assault,
-        Defender,
-        Sniper
+        Assault = 1,
+        Defender = 2,
+        Sniper = 2
     };
     struct SpawnRequest
     {

include/Game/Systems/ScoreScreenSystem.h

@@ -8,6 +8,8 @@
 #include "Core/EPlayerSpawned.h"
 #include "Network/EPlayerConnected.h"
 #include "Network/EPlayerDisconnected.h"
+#include "Game/Events/EReset.h"
+#include "Engine/Input/EInputCommand.h"
 #include "GLM.h"
 
 class ScoreScreenSystem : public PureSystem
@@ -25,6 +27,10 @@ public:
     bool OnPlayerConnected(const Events::PlayerConnected& e);
     EventRelay<ScoreScreenSystem, Events::PlayerDisconnected> m_EPlayerDisconnected;
     bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
+    EventRelay<ScoreScreenSystem, Events::Reset> m_EReset;
+    bool OnReset(const Events::Reset& e);
+    EventRelay<ScoreScreenSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
 
 private:
     struct PlayerData {

include/Game/Systems/SpawnerSystem.h

@@ -19,6 +19,7 @@ public:
     // will try to pick a spawn location so that the spawned entity doesn't 
     // collide with anything that has that component and is collidable.
     static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
+    static EntityWrapper SpawnEntityFile(const std::string& entityFilePath, EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
 
 private:
     EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;

include/Game/Systems/SpectatorCameraSystem.h

@@ -4,6 +4,7 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
 #include "Network/EPlayerDisconnected.h"
+#include "Game/Events/EReset.h"
 
 class SpectatorCameraSystem : public ImpureSystem
 {
@@ -15,11 +16,14 @@ public:
 private:
     int m_PickedTeam;
     bool m_CamSetToTeamPick;
+    void reset();
 
     EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<SpectatorCameraSystem, Events::PlayerDisconnected> m_EDisconnect;
     bool OnDisconnect(const Events::PlayerDisconnected& e);
+    EventRelay<SpectatorCameraSystem, Events::Reset> m_EReset;
+    bool OnReset(const Events::Reset& e);
 };
 
 #endif

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -31,12 +31,14 @@ private:
 
     // Weapon functions
     void fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi);
-    //void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
     bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
     bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
 
     // Utility
     //Camera cameraFromEntity(EntityWrapper camera);
+
+    void CheckBoost(ComponentWrapper cWeapon, WeaponInfo& wi);
+
 };
 
 #endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -6,6 +6,7 @@
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Sound/EPlaySoundOnEntity.h"
+#include <glm/gtx/vector_angle.hpp>
 
 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {
@@ -23,18 +24,24 @@ public:
     void OnReload(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     void OnHolster(ComponentWrapper cWeapon, WeaponInfo& wi) override;
     bool OnInputCommand(ComponentWrapper cWeapon, WeaponInfo& wi, const Events::InputCommand& e) override;
+    void OnEquip(ComponentWrapper cWeapon, WeaponInfo& wi) override;
+
 
 private:
     std::random_device m_RandomDevice;
     std::mt19937 m_RandomEngine;
 
+
+
     // Weapon functions
     void fireShell(ComponentWrapper cWeapon, WeaponInfo& wi);
-    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
+    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, const std::vector<glm::vec2>& pattern);
+    void spawnTracers(ComponentWrapper cWeapon, WeaponInfo& wi, std::vector<glm::vec2> pattern);
     bool canFire(ComponentWrapper cWeapon, WeaponInfo& wi);
 
     // Utility
     Camera cameraFromEntity(EntityWrapper camera);
+    void CheckBoost(ComponentWrapper cWeapon, WeaponInfo& wi);
 };
 
 #endif

include/Game/Systems/Weapon/SidearmWeaponBehaviour.h

@@ -4,6 +4,8 @@
 #include "WeaponBehaviour.h"
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
+#include "Sound/EPlaySoundOnEntity.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 class SidearmWeaponBehaviour : public WeaponBehaviour<SidearmWeaponBehaviour>
 {
@@ -18,6 +20,7 @@ public:
     void UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo& wi, double dt) override;
     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;
 
@@ -32,6 +35,16 @@ private:
     // Utility
     bool canFire(ComponentWrapper cWeapon);
     bool playerInFirstPerson(EntityWrapper player);
+
+    bool dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi);
+   // void giveAmmo(ComponentWrapper cWeapon, WeaponInfo& wi, EntityWrapper receiver);
+
+    void spawnTracer(ComponentWrapper cWeapon, WeaponInfo& wi);
+
+    void CheckAmmo(ComponentWrapper cWeapon, WeaponInfo& wi);
+    void RemoveFrindlyAmmoHUD(WeaponInfo& wi);
+
+
     //float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
 };
 

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -306,6 +306,8 @@ private:
         wi.ThirdPersonEntity = thirdPersonWeapon;
         wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
+        player["Player"]["CurrentWeapon"] = cWeapon.Info.Name;
+
         OnEquip(cWeapon, wi);
     }
 

resources/DefaultConfig.ini

@@ -3,11 +3,11 @@ AutoReload=true
 
 [Debug]
 LogLevel=1
-LoadMap=
+LoadMap=Schema/Entities/StartMenu.xml
 ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. 
 ; if false -> Use pool allocation.
 DisableMemoryPool=false
-RespawnTime = -1.0
+RespawnTime=-1.0
 EditorEnabled=false
 OutOfBodyExperience=false
 
@@ -22,7 +22,7 @@ Height=720
 FOV=45
 
 [Networking]
-StartNetwork=false
+StartNetwork=true
 IsServer=false
 Name=Bob
 Address=127.0.0.1
@@ -30,7 +30,7 @@ Port=27666
 MaxConnections=8
 SnapshotInterval=0.05
 SendInputIntervalMs=33
-PingIntervalMs= 1000
+PingIntervalMs=1000
 TimeoutMs=15000
 
 [Multithreading]
@@ -43,7 +43,7 @@ AnnouncerVolume=1.0
 Announcer=female
 
 [SSAO]
-Quality=0
+Quality=1
 
 [SSAO1]
 Radius=1.0
@@ -76,13 +76,16 @@ NumIterations=9
 TextureQuality=0
 
 [GLOW]
-Quality=3
+Quality=1
 
 [GLOW1]
-NumIterations=5
+NumIterations=2
 
 [GLOW2]
-NumIterations=9
+NumIterations=4
 
 [GLOW3]
-NumIterations=13
+NumIterations=6
+
+[MSAA]
+Level=2

resources/DefaultInput.ini

@@ -1,5 +1,5 @@
 [Mouse]
-Sensitivity=0.5
+Sensitivity=0.05
 InvertPitch=false
 
 [Keyboard]
@@ -30,5 +30,3 @@ F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
 Comma=SwapToClassPick
 Period=SwapToTeamPick
-Enter=PickClass,1
-F5=DisconnectFromServer

resources/README.txt

@@ -0,0 +1,17 @@
+To start a server
+
+	1. Run "Axyz Server" from the start menu or "Server.bat" in the installation directory (C:\Program Files\Axyz)
+	2. Press F1 to open the editor mode
+	3. Expand the Entities window if it is minimized, by double-clicking it
+	4. Mark StartMenu_Origin and hit Delete twice
+	5. Hit Import and choose CP_Valhalla.xml
+	6. Press F1 again to leave editor mode for an acceptable framerate
+
+To join a game
+
+	1. Run "Axyz" from the start menu or "Axyz.exe" in the installation directory (C:\Program Files\Axyz)
+	2. Press Play
+	3. Hit the refresh icon if no server is visible
+	4. Click the server you want to join
+	5. Follow on-screen directions
+	6. Enjoy the game :)

resources/Schema/Components.xsd

@@ -68,6 +68,9 @@
 	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
 	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
 	<xs:include schemaLocation="Components/ServerList.xsd"/>
+	<xs:include schemaLocation="Components/Unpickable.xsd"/>
 	<xs:include schemaLocation="Components/ConfigBtnResolution.xsd"/>
 	<xs:include schemaLocation="Components/ConfigBtnFloat.xsd"/>
+	<xs:include schemaLocation="Components/EndScreen.xsd"/>
+	<xs:include schemaLocation="Components/Fade.xsd"/>
 </xs:schema>

resources/Schema/Components/BoostAssault.xml

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

resources/Schema/Components/CapturePointGameMode.xml

@@ -2,4 +2,5 @@
 <CapturePointGameMode xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="CapturePointGameMode.xsd">
 	<RespawnTime>0.0</RespawnTime>
 	<MaxRespawnTime>8.0</MaxRespawnTime>
+	<ResetCountdown>10.0</ResetCountdown>
 </CapturePointGameMode>

resources/Schema/Components/CapturePointGameMode.xsd

@@ -12,6 +12,9 @@
 				<xs:element name="MaxRespawnTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Players will be spawned when RespawnTime reaches this.</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="ResetCountdown" type="t:double" minOccurs="0">
+					<xs:annotation><xs:documentation>The map will be reset when time reaches 0.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/DefenderWeapon.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <DefenderWeapon xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DefenderWeapon.xsd">
 	<Slot><Primary/></Slot>
-	<MagazineAmmo>8</MagazineAmmo>
+	<MagazineAmmo>9999</MagazineAmmo>
 	<MagazineSize>8</MagazineSize>
 	<Ammo>64</Ammo>
 	<MaxAmmo>64</MaxAmmo>
 	<BaseDamage>90</BaseDamage>
-	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
+	<SpreadAngle>10</SpreadAngle>
 	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
-	<NumPellets>10</NumPellets>
+	<NumPellets>9</NumPellets>
 	<RPM>120</RPM>
-	<ViewPunch>0.03</ViewPunch>
-	<ViewReturnSpeed>0.2</ViewReturnSpeed>
+	<ViewPunch>0.15</ViewPunch>
+	<ViewReturnSpeed>0.3</ViewReturnSpeed>
 	<ReloadTime>0.5</ReloadTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>

resources/Schema/Components/DefenderWeapon.xsd

@@ -36,7 +36,7 @@
 					<xs:annotation><xs:documentation>Damage dealt if all shotgun pellets hit</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="SpreadAngle" type="t:float" minOccurs="0">
-					<xs:annotation><xs:documentation>Spread angle in radians</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>The spread angle radius.</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>

resources/Schema/Components/EndScreen.xml

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

resources/Schema/Components/EndScreen.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="EndScreen">
+		<xs:annotation>
+			<xs:documentation>Put this on the camera that will show the final screen.</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/Fade.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Fade xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Fade.xsd">
+	<FadeTime>1</FadeTime>
+	<Time>0</Time>
+	<Out>true</Out>
+	<Loop>true</Loop>
+	<Reverse>false</Reverse>
+</Fade>

resources/Schema/Components/Fade.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="Fade">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="FadeTime" type="t:double" minOccurs="0"/>
+				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Out" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the entity should fade out or in.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Loop" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the effect should loop when it is done.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the entity should reverse the fade after finishing, this will double the speed.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/PlayerSpawn.xml

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<PlayerSpawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PlayerSpawn.xsd"/>
+<PlayerSpawn xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PlayerSpawn.xsd">
+	<AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+	<DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+	<SniperFile></SniperFile>
+</PlayerSpawn>

resources/Schema/Components/PlayerSpawn.xsd

@@ -7,5 +7,12 @@
 		<xs:annotation>
 			<xs:documentation>Combined with a Spawner and a Team component, defines a spawn point for a player team.</xs:documentation>
 		</xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="AssaultFile" type="t:string" minOccurs="0"/>
+				<xs:element name="DefenderFile" type="t:string" minOccurs="0"/>
+				<xs:element name="SniperFile" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/SidearmWeapon.xml

@@ -6,11 +6,15 @@
 	<BaseDamage>20</BaseDamage>
 	<RPM>500</RPM>
 	<Automatic>false</Automatic>
-	<ViewPunch>0.01</ViewPunch>
-	<ReloadTime>0.5</ReloadTime>
+	<ViewPunch>0.05</ViewPunch>
+	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
+	<ViewReturnSpeed>0.2</ViewReturnSpeed>
+	<ReloadTime>1.0</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>
+	<ReloadQueued>false</ReloadQueued>
 	<IsReloading>false</IsReloading>
 	<ReloadTimer>0</ReloadTimer>
+	<CurrentTravel>0</CurrentTravel>	
 </SidearmWeapon>

resources/Schema/Components/SidearmWeapon.xsd

@@ -36,6 +36,12 @@
 				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ViewReturnSpeed" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The speed in radians per second the view returns to its original position after being punched</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
@@ -44,8 +50,10 @@
 				</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"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Sprite.xml

@@ -10,5 +10,6 @@
 	<KeepRatioY>false</KeepRatioY>
 	<KeepRatio>false</KeepRatio>
 	<Linear>true</Linear>
+	<ClampToBorder>false</ClampToBorder>
 	<BlurBackground>false</BlurBackground>
 </Sprite>

resources/Schema/Components/Sprite.xsd

@@ -39,6 +39,9 @@
 				<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="ClampToBorder" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If it should clamp to border or repeat the texture.</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>

resources/Schema/Components/Unpickable.xml

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

resources/Schema/Components/Unpickable.xsd

@@ -0,0 +1,11 @@
+<?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="Unpickable">
+		<xs:annotation>
+			<xs:documentation>Makes the entity unpickable</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+</xs:schema>

resources/Schema/Entities/10Degrees.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="RayBlue">
+      <Components>
+        <c:Transform>
+          <Orientation X="0" Y="0.174532995" Z="0"/>
+          <Scale X="0" Y="1" Z="100"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="-1.57099998" Z="0"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="RayBlue">
+      <Components>
+        <c:Transform>
+          <Scale X="0" Y="1" Z="100"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="-1.57099998" Z="0"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Sprite>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
+              <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.5"/>
+              <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
+              <Scale X="1" Y="0.0260000005" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/AmmoShareEffectView.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>1.2000000476837158</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="2.08100009" Y="3.37400007" Z="0"/>
+      <ExplosionOrigin X="0" Y="0" Z="2.91200018"/>
+      <TimeSinceDeath>1.2000000476837158</TimeSinceDeath>
+      <Speed>-1</Speed>
+      <ExplosionDuration>1.2000000476837158</ExplosionDuration>
+      <EndColor A="0.262745112" B="19.6078434" G="3.92156863" R="0"/>
+      <Randomness>true</Randomness>
+      <ColorByDistance>true</ColorByDistance>
+    </c:ExplosionEffect>
+    <c:Model>
+      <GlowIntensity>16.040000915527344</GlowIntensity>
+      <Resource>Models/Effects/JumpEffectHexagon.mesh</Resource>
+      <Color A="0" B="1.96078432" G="0" R="3.92156863"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:NetworkComponent/>
+    <c:Transform>
+      <Position X="0" Y="-0.0900000036" Z="-0.00600000005"/>
+      <Orientation X="1.57000005" Y="0" Z="0"/>
+      <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/CapturePointBorderBlue.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="BlueCapturepointBorde" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="0.271661639" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Bottom">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>3</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-8.74227801e-09" Z="-0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.392156869" B="10" G="0.784313738" R="0"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.5" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="LowerMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>2</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025388" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.313725501" B="10" G="0.784313738" R="0"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.899999976" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="UpperMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>1</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025463" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.196078435" B="10" G="0.784313738" R="0"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.29999995" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Top">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.117647059" B="10" G="0.784313738" R="0"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.70000005" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/CapturePointBorderRed.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="RedCapturepointBorde" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="0.271661639" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Bottom">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>3</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-8.74227801e-09" Z="-0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.392156869" B="0" G="0.235294119" R="21.9607849"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.5" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="LowerMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>2</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025388" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.313725501" B="0" G="0.235294119" R="21.9607849"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.899999976" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="UpperMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>1</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025463" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.196078435" B="0" G="0.235294119" R="21.9607849"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.29999995" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Top">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.117647059" B="0" G="0.235294119" R="21.9607849"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.70000005" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/CapturePointBorderSpectator.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SpectatorCapturepointBorde" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="0.271661639" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Bottom">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>3</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-8.74227801e-09" Z="-0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.392156869" B="8.03921604" G="8.03921604" R="8.03921604"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.5" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="LowerMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>2</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025388" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.313725501" B="10" G="8.03921604" R="8.03921604"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.899999976" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="UpperMid">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Time>1</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0866025463" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.196078435" B="8.03921604" G="8.03921604" R="8.03921604"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.29999995" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Top">
+      <Components>
+        <c:FloatingEffect>
+          <Period>6</Period>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.10000000149011612</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/DoubleSidedCylinder.mesh</Resource>
+              <Color A="0.117647059" B="8.03921604" G="8.03921604" R="8.03921604"/>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="1.70000005" Z="0"/>
+              <Scale X="8.19999981" Y="0.0199999996" Z="8.19999981"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DDS.xml

@@ -0,0 +1,19 @@
+<?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:SceneLight>
+      <AmbientColor A="1" B="1" G="1" R="1"/>
+    </c:SceneLight>
+    <c:Sprite>
+      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
+      <GlowMap></GlowMap>
+    </c:Sprite>
+    <c:Transform>
+      <Position X="0" Y="0" Z="-1.60000002"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/DashEffect.xml

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

resources/Schema/Entities/DefenderShield.xml

@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Shield" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Back">
+      <Components>
+        <c:Blend>
+          <Pose1>Deploy</Pose1>
+          <Pose2>Idle</Pose2>
+          <Weight>0</Weight>
+        </c:Blend>
+        <c:Shielded/>
+        <c:Model>
+          <Resource>Models/Characters/Defender/DefenderShieldBack.mesh</Resource>
+          <Color A="0.219607845" B="3.92156863" G="1" R="1"/>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+          <NormalMap>false</NormalMap>
+          <DiffuseTexture>false</DiffuseTexture>
+          <SpecularMap>false</SpecularMap>
+          <GlowMap>false</GlowMap>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Deploy">
+          <Components>
+            <c:Animation>
+              <AnimationName>ActivateShieldU</AnimationName>
+              <Play>true</Play>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Front">
       <Components>
         <c:Blend>
           <Pose1>Deploy</Pose1>
@@ -8,33 +48,32 @@
           <Weight>0</Weight>
         </c:Blend>
         <c:Model>
-      <Resource>Models/Characters/Defender/DefenderShield.mesh</Resource>
+          <Resource>Models/Characters/Defender/DefenderShieldFront.mesh</Resource>
+          <Color A="0.219607845" B="3.92156863" G="1" R="1"/>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+          <NormalMap>false</NormalMap>
+          <DiffuseTexture>false</DiffuseTexture>
+          <SpecularMap>false</SpecularMap>
+          <GlowMap>false</GlowMap>
         </c:Model>
+        <c:Shield/>
         <c:Transform/>
       </Components>
-
       <Children>
         <Entity name="Deploy">
           <Components>
             <c:Animation>
-          <AnimationName>ActivateDeactiveShieldF</AnimationName>
-          <Time>1</Time>
-          <Speed>1</Speed>
-        </c:Animation>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Idle">
-      <Components>
-        <c:Animation>
-          <AnimationName>ShieldFrontF</AnimationName>
-          <Speed>1</Speed>
+              <AnimationName>ActivateShieldU</AnimationName>
+              <Play>true</Play>
+              <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
       </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/EndScreen.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="EndScreen_Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="3.10000014" Z="42.9360008"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Camera">
+      <Components>
+        <c:Camera/>
+        <c:EndScreen/>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Sprite_Origin">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0.65200001" Z="-1.72800004"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="SpriteRed">
+              <Components>
+                <c:Sprite>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <Color A="0.588235319" B="0" G="0" R="0.588235319"/>
+                  <Visible>false</Visible>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="1.30000007" Y="0.300000012" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="SpriteBlue">
+              <Components>
+                <c:Sprite>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <Color A="0.588235319" B="0.588235319" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="1.30000007" Y="0.300000012" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="TextBlue">
+              <Components>
+                <c:Text>
+                  <Content>Blue team win!</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="-0.0670000017" Z="0.0299999993"/>
+                  <Scale X="0.150000006" Y="0.150000006" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="TextRed">
+              <Components>
+                <c:Text>
+                  <Content>Red team win!</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="-0.0670000017" Z="0.0299999993"/>
+                  <Scale X="0.150000006" Y="0.150000006" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/FriendlyAmmoHUD.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="FriendlyAmmoHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="AmmunitionHUDBackground">
+      <Components>
+        <c:Sprite>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
+          <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.00300000003"/>
+          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="AmmunitionText">
+      <Components>
+        <c:Transform>
+          <Position X="-6.26170804e-05" Y="-0.0136084575" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="MagazineAmmo">
+          <Components>
+            <c:Text>
+              <Content>88</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="1.25490201" G="0" R="1.25490201"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="1.53152232e-05" Y="0.0123614743" Z="-8.43336147e-06"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Ammo">
+          <Components>
+            <c:Text>
+              <Content>88</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="1.25490201" G="0" R="1.25490201"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="-5.92374272e-06" Y="-0.00478126714" Z="3.26191866e-06"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/FriendlyBoostAttachement.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="FriendlyBoostAttachment" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Spawner>
+      <EntityFile>Schema/Entities/FriendlyBoostBlueHUD.xml</EntityFile>
+    </c:Spawner>
+    <c:Transform>
+      <Position X="-0.000110394583" Y="-0.0891034827" Z="6.07890324e-05"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/FriendlyBoostBlueHUD.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="FriendlyBoostHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.5</Lifetime>
+    </c:Lifetime>
+    <c:Transform>
+      <Scale X="1.20000005" Y="1.20000005" Z="1"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="BoostHUDBackground">
+      <Components>
+        <c:Sprite>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
+          <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.00300000003"/>
+          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BoostIcons">
+      <Components>
+        <c:Transform>
+          <Position X="-1.47358617e-06" Y="-0.0191892758" Z="4.05375999e-07"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="AssaultBoost">
+          <Components>
+            <c:Transform>
+              <Position X="0.0120000001" Y="0.00899999961" Z="-8.43336147e-06"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\1</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="1.37254906" G="0.392156869" R="0"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.0149999997"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\1</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="DefenderBoost">
+          <Components>
+            <c:Transform>
+              <Position X="-0.0120000001" Y="0.00900000054" Z="-8.43336147e-06"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\2</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\2</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="1.37254906" G="0.392156869" R="0"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="SniperBoost">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0.0310000014" Z="-1.21438188e-05"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\3</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="1.37254906" G="0.392156869" R="0"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\3</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/FriendlyBoostRedHUD.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="FriendlyBoostHUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.5</Lifetime>
+    </c:Lifetime>
+    <c:Transform>
+      <Scale X="1.20000005" Y="1.20000005" Z="1"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="BoostHUDBackground">
+      <Components>
+        <c:Sprite>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
+          <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.00300000003"/>
+          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BoostIcons">
+      <Components>
+        <c:Transform>
+          <Position X="-1.47358617e-06" Y="-0.0191892758" Z="4.05375999e-07"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="AssaultBoost">
+          <Components>
+            <c:Transform>
+              <Position X="0.0120000001" Y="0.00899999961" Z="-8.43336147e-06"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\1</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.392156869" G="0.392156869" R="1.37254906"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.0149999997"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\1</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="DefenderBoost">
+          <Components>
+            <c:Transform>
+              <Position X="-0.0120000001" Y="0.00900000054" Z="-8.43336147e-06"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\2</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.392156869" G="0.392156869" R="1.17647064"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\2</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="SniperBoost">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="0.0310000014" Z="-1.21438188e-05"/>
+              <Scale X="0.0199999996" Y="0.0199999996" Z="0.0199999996"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Active">
+              <Components>
+                <c:Text>
+                  <Content>\3</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.392156869" G="0.392156869" R="1.17647064"/>
+                  <Visible>false</Visible>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Inactive">
+              <Components>
+                <c:Text>
+                  <Content>\3</Content>
+                  <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                  <Color A="1" B="0.784313738" G="0.784313738" R="0.784313738"/>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-8.43336147e-06"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HitTest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>10</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="2" Y="2.30000019" Z="0"/>
+      <ExplosionDuration>1</ExplosionDuration>
+      <Randomness>true</Randomness>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+    </c:ExplosionEffect>
+    <c:Model>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Color A="1" B="1" G="1" R="3.92156863"/>
+      <Shadow>false</Shadow>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:Transform>
+      <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashBlue.xml

@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="MuzzleFlashBlue" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.039999999105930328</Lifetime>
+      <Lifetime>0.08</Lifetime>
     </c:Lifetime>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="PlaneRight">
+    <Entity name="Level1">
       <Components>
-        <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
-          <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
-        </c:Model>
         <c:Transform/>
       </Components>
-      <Children/>
-    </Entity>
+      <Children>
         <Entity name="Cone1Outside">
           <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -33,7 +32,12 @@
         </Entity>
         <Entity name="Cone1Inside">
           <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -42,9 +46,39 @@
           </Components>
           <Children/>
         </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="Cone2Outside">
           <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -53,10 +87,40 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="Cone2Inside">
+      </Children>
+    </Entity>
+    <Entity name="Level3">
       <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
             </c:Model>
@@ -66,7 +130,12 @@
         </Entity>
         <Entity name="PlaneUp">
           <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -77,7 +146,12 @@
         </Entity>
         <Entity name="PlaneDown">
           <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+              <Reverse>true</Reverse>
+            </c:Fade>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -86,17 +160,68 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="PlaneLeft">
+      </Children>
+    </Entity>
+    <Entity name="Lights">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Light_front">
           <Components>
             <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
               <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
             </c:Model>
-        <c:Transform/>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.000288648967" Y="0.000489665952" Z="0.0824639797"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_Side">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Radius>0.40000000596046448</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.0870000049" Y="0.0210000016" Z="0.186000004"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_front2">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0.000448234321" Y="-0.000760387513" Z="-0.323961914"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
           </Components>
           <Children/>
         </Entity>
       </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/MuzzleFlashFire.xml

@@ -9,20 +9,15 @@
   </Components>
 
   <Children>
-    <Entity name="PlaneRight">
+    <Entity name="Level1">
       <Components>
-        <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Fire/PlaneRight.mesh</Resource>
-          <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
-        </c:Model>
         <c:Transform/>
       </Components>
-      <Children/>
-    </Entity>
+      <Children>
         <Entity name="Cone1Outside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Fire/Cone1Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -34,6 +29,7 @@
         <Entity name="Cone1Inside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Fire/Cone1Inside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -42,9 +38,31 @@
           </Components>
           <Children/>
         </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Fire/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="Cone2Outside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Fire/Cone2Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -53,10 +71,32 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="Cone2Inside">
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
           <Components>
             <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Fire/Cone2Inside.mesh</Resource>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Fire/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Fire/PlaneRight.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
             </c:Model>
@@ -67,6 +107,7 @@
         <Entity name="PlaneUp">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Fire/PlaneUp.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -78,6 +119,7 @@
         <Entity name="PlaneDown">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Fire/PlaneDown.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -86,16 +128,7 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="PlaneLeft">
-      <Components>
-        <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Fire/PlaneLeft.mesh</Resource>
-          <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
+      </Children>
     </Entity>
   </Children>
 

resources/Schema/Entities/MuzzleFlashGreen.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Green/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashLightBlue.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/LightBlue/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashPink.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Pink/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashPurple.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Purple/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashRainbow.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Rainbow/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashRed.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="MuzzleFlashRed" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
@@ -9,20 +9,15 @@
   </Components>
 
   <Children>
-    <Entity name="PlaneRight">
+    <Entity name="Level1">
       <Components>
-        <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Red/PlaneRight.mesh</Resource>
-          <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
-        </c:Model>
         <c:Transform/>
       </Components>
-      <Children/>
-    </Entity>
+      <Children>
         <Entity name="Cone1Outside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Red/Cone1Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -34,6 +29,7 @@
         <Entity name="Cone1Inside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Red/Cone1Inside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -42,9 +38,31 @@
           </Components>
           <Children/>
         </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="Cone2Outside">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Red/Cone2Outside.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -53,10 +71,32 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="Cone2Inside">
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
           <Components>
             <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Red/Cone2Inside.mesh</Resource>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneRight.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
             </c:Model>
@@ -67,6 +107,7 @@
         <Entity name="PlaneUp">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Red/PlaneUp.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -78,6 +119,7 @@
         <Entity name="PlaneDown">
           <Components>
             <c:Model>
+              <GlowIntensity>2</GlowIntensity>
               <Resource>Models/Effects/MuzzleFlash/Red/PlaneDown.mesh</Resource>
               <Shadow>false</Shadow>
               <Transparent>true</Transparent>
@@ -86,17 +128,68 @@
           </Components>
           <Children/>
         </Entity>
-    <Entity name="PlaneLeft">
+      </Children>
+    </Entity>
+    <Entity name="Lights">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Light_front">
           <Components>
             <c:Model>
-          <Resource>Models/Effects/MuzzleFlash/Red/PlaneLeft.mesh</Resource>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
               <Shadow>false</Shadow>
-          <Transparent>true</Transparent>
             </c:Model>
-        <c:Transform/>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.000288648967" Y="0.000489665952" Z="0.0824639797"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_Side">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+              <Radius>0.40000000596046448</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.0870000049" Y="0.0210000016" Z="0.186000004"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_front2">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0.000448234321" Y="-0.000760387513" Z="-0.323961914"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
           </Components>
           <Children/>
         </Entity>
       </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/MuzzleFlashSideArmBlue.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashBlueSidearm" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.08</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.08</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Lights">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Light_front">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.000288648967" Y="0.000489665952" Z="0.0824639797"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_Side">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Radius>0.40000000596046448</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.0870000049" Y="0.0210000016" Z="0.186000004"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_front2">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="1" G="1" R="0"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0.000448234321" Y="-0.000760387513" Z="-0.323961914"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashSideArmRed.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashBlueSidearm" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.080000000000000002</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Fade>
+              <FadeTime>0.080000000000000002</FadeTime>
+            </c:Fade>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Red/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Lights">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Light_front">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.000288648967" Y="0.000489665952" Z="0.0824639797"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_Side">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Color A="1" B="1" G="1" R="0"/>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+              <Radius>0.40000000596046448</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.0870000049" Y="0.0210000016" Z="0.186000004"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light_front2">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitSphere.mesh</Resource>
+              <Visible>false</Visible>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:PointLight>
+              <Color A="1" B="0.588235319" G="0.588235319" R="1"/>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="0.000448234321" Y="-0.000760387513" Z="-0.323961914"/>
+              <Scale X="0.0299999993" Y="0.0299999993" Z="0.0299999993"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashWhite.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/White/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MuzzleFlashYellow.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
+    </c:Lifetime>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Level1">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Cone1Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/Cone1Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone1Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/Cone1Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level2">
+      <Components>
+        <c:Transform>
+          <Position X="0.000134464673" Y="8.11116188e-05" Z="-0.0197895896"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cone2Inside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/Cone2Inside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Cone2Outside">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/Cone2Outside.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Level3">
+      <Components>
+        <c:Transform>
+          <Position X="0.000216802931" Y="0.000130779619" Z="-0.0319075659"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaneLeft">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/PlaneLeft.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneRight">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/PlaneRight.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneUp">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/PlaneUp.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlaneDown">
+          <Components>
+            <c:Model>
+              <GlowIntensity>2</GlowIntensity>
+              <Resource>Models/Effects/MuzzleFlash/Yellow/PlaneDown.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/PlayerAssaultBlue.xml

@@ -14,12 +14,10 @@
     </c:Team>
     <c:Collidable/>
     <c:DashAbility/>
-    <c:DefenderWeapon>
-      <Slot>
-        <Secondary/>
-      </Slot>
-    </c:DefenderWeapon>
     <c:DoubleJump/>
+    <c:SidearmWeapon>
+      <BaseDamage>10</BaseDamage>
+    </c:SidearmWeapon>
     <c:Health/>
     <c:NetworkComponent/>
     <c:Physics>
@@ -30,7 +28,6 @@
       <CurrentWeapon></CurrentWeapon>
     </c:Player>
     <c:Transform>
-      <Position X="-0.300000012" Y="0.0270000007" Z="1.88267219"/>
       <Orientation X="0" Y="-0" Z="0"/>
     </c:Transform>
   </Components>
@@ -60,6 +57,14 @@
           </Components>
           <Children/>
         </Entity>
+        <Entity name="HUD">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/PlayerHUD.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children>
             <Entity name="HUD">
               <Components>
                 <c:Transform>
@@ -70,9 +75,10 @@
                 <Entity name="Crosshair">
                   <Components>
                     <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                       <DepthSort>false</DepthSort>
+                      <Model>Models/Core/UnitQuad.mesh</Model>
+                      <GlowMap></GlowMap>
+                      <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0" Y="0" Z="0.200000003"/>
@@ -101,8 +107,10 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <DepthSort>false</DepthSort>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -119,8 +127,10 @@
                               <CapturePointNumber>2</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -135,8 +145,10 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <DepthSort>false</DepthSort>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -153,8 +165,10 @@
                               <CapturePointNumber>3</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -169,8 +183,10 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <DepthSort>false</DepthSort>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -188,8 +204,10 @@
                               <CapturePointNumber>4</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -204,8 +222,10 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <DepthSort>false</DepthSort>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <Color A="0.300000012" B="1" G="1" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -222,8 +242,10 @@
                               <CapturePointNumber>1</CapturePointNumber>
                             </c:CapturePointHUD>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -238,8 +260,10 @@
                     <Entity name="BackgroundHexagon">
                       <Components>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                          <DepthSort>false</DepthSort>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <Color A="0.699999988" B="0" G="0" R="1"/>
                         </c:Sprite>
                         <c:Transform>
@@ -255,8 +279,10 @@
                             </c:Fill>
                             <c:CapturePointHUD/>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <DepthSort>false</DepthSort>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -283,7 +309,7 @@
                       <Components>
                         <c:Text>
                           <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
                           <Alignment>
                             <Right/>
                           </Alignment>
@@ -296,7 +322,7 @@
                       <Components>
                         <c:Text>
                           <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
                           <Alignment>
                             <Right/>
                           </Alignment>
@@ -311,7 +337,7 @@
                       <Components>
                         <c:Text>
                           <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
                           <Alignment>
                             <Right/>
                           </Alignment>
@@ -333,12 +359,12 @@
                     </c:Team>
                     <c:CapturePointArrowHUD/>
                     <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+                      <Resource>Models/Widgets/Arrows/ArrowBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+                      <Position X="0" Y="0.198665127" Z="0"/>
+                      <Orientation X="0.0531693883" Y="-2.13055706" Z="0"/>
+                      <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -357,12 +383,12 @@
                           <Percentage>1</Percentage>
                           <Color A="1" B="1" G="0" R="0"/>
                         </c:Fill>
+                        <c:HealthHUD/>
                         <c:Text>
                           <Content>100/100</Content>
                           <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+                          <Color A="0.505882382" B="1.56862748" G="1.17647064" R="0"/>
                         </c:Text>
-                    <c:HealthHUD/>
                         <c:Transform>
                           <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
                           <Orientation X="0" Y="0" Z="1.57070696"/>
@@ -379,8 +405,9 @@
                         </c:Fill>
                         <c:HealthHUD/>
                         <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
                           <Color A="0.588235319" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:Transform>
@@ -400,16 +427,17 @@
                         <Entity name="Assault">
                           <Components>
                             <c:Fill>
-                          <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                             </c:Fill>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                               <DepthSort>false</DepthSort>
-                          <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+                              <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                             </c:Sprite>
                             <c:Transform>
-                          <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
+                              <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
                               <Orientation X="0" Y="0" Z="3.14199996"/>
                               <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
                             </c:Transform>
@@ -419,16 +447,17 @@
                         <Entity name="Defender">
                           <Components>
                             <c:Fill>
-                          <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                             </c:Fill>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                               <DepthSort>false</DepthSort>
-                          <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+                              <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                             </c:Sprite>
                             <c:Transform>
-                          <Position X="0.0270000007" Y="0.110000007" Z="0"/>
+                              <Position X="0.0240000002" Y="0.104000002" Z="0"/>
                               <Orientation X="0" Y="0" Z="3.14199996"/>
                               <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
                             </c:Transform>
@@ -438,16 +467,17 @@
                         <Entity name="Sniper">
                           <Components>
                             <c:Fill>
-                          <Color A="1" B="0.345098048" G="0" R="1"/>
+                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                             </c:Fill>
                             <c:Sprite>
-                          <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                               <DepthSort>false</DepthSort>
-                          <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+                              <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                             </c:Sprite>
                             <c:Transform>
-                          <Position X="0.0250000004" Y="0.145000011" Z="0"/>
+                              <Position X="0.0240000002" Y="0.145000011" Z="0"/>
                               <Orientation X="0" Y="0" Z="3.14199996"/>
                               <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
                             </c:Transform>
@@ -463,30 +493,16 @@
                           <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
                         </c:Fill>
                         <c:Sprite>
-                      <DiffuseTexture>Textures\Icons\Abilities\Superman-01.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                           <DepthSort>false</DepthSort>
-                      <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
+                          <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Icons/Abilities/Long/Superman-01.png</DiffuseTexture>
+                          <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
-                      <Orientation X="0" Y="0" Z="3.14159203"/>
-                      <Scale X="0.0800000057" Y="0.0700000003" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Cooldown">
-                      <Components>
-                        <c:Text>
-                          <Content>0.0</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="0" G="0" R="0"/>
-                          <Visible>false</Visible>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
-                          <Orientation X="0" Y="0" Z="1.57099998"/>
-                          <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+                          <Orientation X="0" Y="0" Z="1.57000005"/>
+                          <Scale X="0.0800000057" Y="0.029000001" Z="1"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -517,11 +533,11 @@
             <Entity name="SecondaryAttachment">
               <Components>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponDefenderBlueView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/WeaponSidearmAssaultBlueView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform/>
                 <c:WeaponAttachment>
-                  <Weapon>DefenderWeapon</Weapon>
+                  <Weapon>SidearmWeapon</Weapon>
                 </c:WeaponAttachment>
               </Components>
               <Children/>
@@ -556,6 +572,7 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
+          <GlowIntensity>2.2000000476837158</GlowIntensity>
           <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
         </c:Model>
         <c:Transform/>
@@ -570,8 +587,8 @@
               <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.17052114" Y="1.03320956" Z="-0.224843055"/>
-              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
+              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
+              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
@@ -588,11 +605,11 @@
               <BoneName>R_Arm_Weapon_Joint</BoneName>
             </c:BoneAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
+              <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.17052114" Y="1.03320956" Z="-0.224843055"/>
-              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
+              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
+              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>SidearmWeapon</Weapon>
@@ -659,7 +676,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                  <Time>0.79179726223533642</Time>
+                                  <Time>0.47961568648540975</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -670,7 +687,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.719118724186119</Time>
+                                  <Time>0.40693714843619233</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -683,7 +700,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.49749270936352197</Time>
+                              <Time>0.1853111336135953</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -696,7 +713,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>CrouchF</AnimationName>
-                          <Time>1.1707202063102131</Time>
+                          <Time>1.8585386305602865</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -739,7 +756,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                  <Time>0.0026473387732952602</Time>
+                                  <Time>0.87165493950985962</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -750,7 +767,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                  <Time>0.60179430680919843</Time>
+                                  <Time>0.33980950828232714</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -774,7 +791,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.20450294221067544</Time>
+                                  <Time>0.94251814368380415</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -786,7 +803,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.28191395104664174</Time>
+                                  <Time>0.019929152519770454</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -802,7 +819,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                          <Time>0.96819454985941356</Time>
+                          <Time>0.55386718012173475</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -926,7 +943,7 @@
         <Entity name="BlendTreeUpper">
           <Components>
             <c:Blend>
-              <Pose1>AssaultWeaponBlend</Pose1>
+              <Pose1>AssaultWeapon</Pose1>
               <Pose2>SidearmWeapon</Pose2>
               <Weight>0</Weight>
               <SubTreeRoot>true</SubTreeRoot>
@@ -934,7 +951,7 @@
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="AssaultWeaponBlend">
+            <Entity name="AssaultWeapon">
               <Components>
                 <c:BlendAdditive>
                   <Adder>Aim</Adder>
@@ -946,7 +963,7 @@
                 <Entity name="WeaponBlend">
                   <Components>
                     <c:BlendAdditive>
-                      <Adder>MovementBlend</Adder>
+                      <Adder>IdleAssault</Adder>
                       <Receiver>ActionBlend</Receiver>
                     </c:BlendAdditive>
                     <c:Transform/>
@@ -985,21 +1002,11 @@
                         </Entity>
                       </Children>
                     </Entity>
-                    <Entity name="MovementBlend2">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>Idle</Pose1>
-                          <Pose2>Run</Pose2>
-                          <Weight>0</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Run">
+                    <Entity name="IdleAssault">
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleAssaultRifleU</AnimationName>
-                              <Time>1.6337870249215687</Time>
+                          <Time>1.502794625658133</Time>
                           <Play>true</Play>
                           <Additive>true</Additive>
                         </c:Animation>
@@ -1007,20 +1014,6 @@
                       </Components>
                       <Children/>
                     </Entity>
-                        <Entity name="Idle">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>IdleAssaultRifleU</AnimationName>
-                              <Time>1.6337870249215687</Time>
-                              <Play>true</Play>
-                              <Additive>true</Additive>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
                   </Children>
                 </Entity>
                 <Entity name="Aim">
@@ -1038,6 +1031,308 @@
                 </Entity>
               </Children>
             </Entity>
+            <Entity name="SidearmWeapon">
+              <Components>
+                <c:BlendAdditive>
+                  <Adder>Aim</Adder>
+                  <Receiver>WeaponBlend</Receiver>
+                </c:BlendAdditive>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponBlend">
+                  <Components>
+                    <c:BlendAdditive>
+                      <Adder>IdleSidearm</Adder>
+                      <Receiver>ActionBlend</Receiver>
+                    </c:BlendAdditive>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ActionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Reload</Pose1>
+                          <Pose2>Fire</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Reload">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ReloadSwitchU</AnimationName>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Fire">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ShootSecWepU</AnimationName>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="IdleSidearm">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleSecWepU</AnimationName>
+                          <Additive>true</Additive>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Aim">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimSecWepA</AnimationName>
+                      <Time>0.5</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Lights">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Elbow_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.0546795987" Y="0.970895708" Z="-0.395071507"/>
+                  <Orientation X="-2.67347836" Y="-1.14967656" Z="-2.35179591"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.119805202" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0430894755" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Elbow_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.311819345" Y="1.00506735" Z="-0.00708915293"/>
+                  <Orientation X="1.66802835" Y="1.3856616" Z="0.553554595"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.119999997" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0430000015" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Head">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>Head</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.0847049356" Y="1.25094736" Z="-0.146904141"/>
+                  <Orientation X="-0.270355761" Y="-0.134028792" Z="-0.181556195"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Left">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.117407471" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Right">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.116999999" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_top_left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Top</BoneName>
+                  <PositionOffset X="-0.116000004" Y="0.0500000007" Z="0.0360000022"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-0.187708378" Y="0.720764816" Z="0.0189282075"/>
+                  <Orientation X="0.690089703" Y="-0.0030452935" Z="-0.0742322952"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_top_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Top</BoneName>
+                  <PositionOffset X="0.0800000057" Y="0.0730000064" Z="0.064000003"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.149033397" Y="0.743774891" Z="0.0911710933"/>
+                  <Orientation X="0.00418904377" Y="-0.590482414" Z="0.240698725"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_bottom_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Bottomdw</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.121549807" Y="0.396206558" Z="-0.258821368"/>
+                  <Orientation X="0.0123701356" Y="0.0872921124" Z="-0.0923962742"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_bottom_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Bottom</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.184887171" Y="0.323244393" Z="0.0367886424"/>
+                  <Orientation X="-0.714135528" Y="-0.644820809" Z="0.337111086"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
       </Children>
@@ -1087,9 +1382,10 @@
     <Entity name="Indicator">
       <Components>
         <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <GlowMap></GlowMap>
           <DepthSort>false</DepthSort>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
+          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
           <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Sprite>
         <c:HiddenForLocalPlayer/>

resources/Schema/Entities/PlayerHUD.xml

@@ -11,9 +11,10 @@
     <Entity name="Crosshair">
       <Components>
         <c:Sprite>
-          <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-          <GlowMap></GlowMap>
           <DepthSort>false</DepthSort>
+          <Model>Models/Core/UnitQuad.mesh</Model>
+          <GlowMap></GlowMap>
+          <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
         </c:Sprite>
         <c:Transform>
           <Position X="0" Y="0" Z="0.200000003"/>
@@ -42,9 +43,10 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -61,9 +63,10 @@
                   <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -78,9 +81,10 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Sprite>
             <c:Transform>
@@ -98,9 +102,10 @@
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -115,9 +120,10 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -134,9 +140,10 @@
                   <CapturePointNumber>2</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -151,9 +158,10 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -170,9 +178,10 @@
                   <CapturePointNumber>1</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -187,9 +196,10 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.699999988" B="0" G="0" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -205,9 +215,10 @@
                 </c:Fill>
                 <c:CapturePointHUD/>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -234,7 +245,7 @@
           <Components>
             <c:Text>
               <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Resource>Fonts/Hind-Edited.otf,64</Resource>
               <Alignment>
                 <Right/>
               </Alignment>
@@ -247,7 +258,7 @@
           <Components>
             <c:Text>
               <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Resource>Fonts/Hind-Edited.otf,64</Resource>
               <Alignment>
                 <Right/>
               </Alignment>
@@ -262,7 +273,7 @@
           <Components>
             <c:Text>
               <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Resource>Fonts/Hind-Edited.otf,64</Resource>
               <Alignment>
                 <Right/>
               </Alignment>
@@ -284,10 +295,11 @@
         </c:Team>
         <c:CapturePointArrowHUD/>
         <c:Model>
-          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+          <Resource>Models/Widgets/Arrows/ArrowBlue.mesh</Resource>
         </c:Model>
         <c:Transform>
           <Position X="0" Y="0.198665127" Z="0"/>
+          <Orientation X="0.0531693883" Y="-2.13055706" Z="0"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
         </c:Transform>
       </Components>
@@ -307,12 +319,12 @@
               <Percentage>1</Percentage>
               <Color A="1" B="1" G="0" R="0"/>
             </c:Fill>
+            <c:HealthHUD/>
             <c:Text>
               <Content>100/100</Content>
               <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+              <Color A="0.505882382" B="1.56862748" G="1.17647064" R="0"/>
             </c:Text>
-            <c:HealthHUD/>
             <c:Transform>
               <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
               <Orientation X="0" Y="0" Z="1.57070696"/>
@@ -329,8 +341,9 @@
             </c:Fill>
             <c:HealthHUD/>
             <c:Sprite>
-              <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+              <Model>Models/Core/UnitQuad.mesh</Model>
               <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
               <Color A="0.588235319" B="0" G="0" R="0"/>
             </c:Sprite>
             <c:Transform>
@@ -350,16 +363,17 @@
             <Entity name="Assault">
               <Components>
                 <c:Fill>
-                  <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                  <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                 </c:Fill>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.0392156877" G="0.184313729" R="0"/>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+                  <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                 </c:Sprite>
                 <c:Transform>
-                  <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
+                  <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
                   <Orientation X="0" Y="0" Z="3.14199996"/>
                   <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
                 </c:Transform>
@@ -369,16 +383,17 @@
             <Entity name="Defender">
               <Components>
                 <c:Fill>
-                  <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                  <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                 </c:Fill>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.34117648" G="0.192156866" R="0"/>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+                  <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                 </c:Sprite>
                 <c:Transform>
-                  <Position X="0.0270000007" Y="0.110000007" Z="0"/>
+                  <Position X="0.0240000002" Y="0.104000002" Z="0"/>
                   <Orientation X="0" Y="0" Z="3.14199996"/>
                   <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
                 </c:Transform>
@@ -388,16 +403,17 @@
             <Entity name="Sniper">
               <Components>
                 <c:Fill>
-                  <Color A="1" B="0.345098048" G="0" R="1"/>
+                  <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
                 </c:Fill>
                 <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
                   <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.121568628" G="0" R="0.443137258"/>
+                  <Model>Models/Core/UnitQuad.mesh</Model>
+                  <GlowMap></GlowMap>
+                  <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+                  <Color A="0.392156869" B="0.352941185" G="0.196078435" R="0"/>
                 </c:Sprite>
                 <c:Transform>
-                  <Position X="0.0250000004" Y="0.145000011" Z="0"/>
+                  <Position X="0.0240000002" Y="0.145000011" Z="0"/>
                   <Orientation X="0" Y="0" Z="3.14199996"/>
                   <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
                 </c:Transform>
@@ -413,15 +429,16 @@
               <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
             </c:Fill>
             <c:Sprite>
-              <DiffuseTexture>Textures/Icons/Abilities/Superman-01.png</DiffuseTexture>
-              <GlowMap></GlowMap>
               <DepthSort>false</DepthSort>
-              <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+              <Model>Models/Core/UnitQuad.mesh</Model>
+              <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
+              <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
             </c:Sprite>
             <c:Transform>
               <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
-              <Orientation X="0" Y="0" Z="3.14159203"/>
-              <Scale X="0.0800000057" Y="0.0700000003" Z="1"/>
+              <Orientation X="0" Y="0" Z="1.57000005"/>
+              <Scale X="0.0800000057" Y="0.029000001" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>