Separating RawModel from Model

include/Engine/Collision/Collision.h

@@ -48,13 +48,13 @@ bool RayVsTriangle(const Ray& ray,
     bool trueOnNegativeDistance = false);
 //Return true if the ray hits any of the triangles in the model. Stops checking when a hit is detected.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 //Return true if the ray hits any of the triangles in the model.
 //Also returns the position of the intersection point. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     glm::vec3& outHitPosition);
@@ -62,7 +62,7 @@ bool RayVsModel(const Ray& ray,
 //Also returns the distance from the ray origin to the closest 
 //intersection point, and the barycentric u,v-coordinates. Will loop through all the whole model indices.
 bool RayVsModel(const Ray& ray,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     float& outDistance,
@@ -70,7 +70,7 @@ bool RayVsModel(const Ray& ray,
     float& outVCoord);
 
 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix,
     glm::vec3& boxVelocity,
@@ -80,7 +80,7 @@ bool AABBvsTriangles(const AABB& box,
 
 //Detects collision, but does not resolve.
 bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 
@@ -92,7 +92,7 @@ enum Output
 };
 //Detects intersection and containment.
 Output AABBvsTrianglesWContainment(const AABB& box,
-    const RawModel::Vertex* modelVertices,
+    const std::vector<glm::vec3>& modelVertices,
     const std::vector<unsigned int>& modelIndices,
     const glm::mat4& modelMatrix);
 

include/Engine/Core/ECaptured.h

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

include/Engine/Core/PerformanceTimer.h

@@ -2,11 +2,8 @@
 #define PerformanceTimer_h__
 
 #include "../Common.h"
-
-#ifdef DEBUG
 #include <boost/timer/timer.hpp>
 using boost::timer::cpu_timer;
-#endif //DEBUG
 
 class PerformanceTimer
 {
@@ -20,11 +17,9 @@ 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& cFade, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& scoreScreen, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Editor/EditorSystem.h

@@ -43,7 +43,6 @@ private:
     EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
     EntityWrapper m_Widget = EntityWrapper::Invalid;
     EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
-    glm::vec3 m_CamVelocity;
 
     // Utility functions
     EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);

include/Engine/Input/FirstPersonInputController.h

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

include/Engine/Network/Client.h

@@ -10,34 +10,28 @@
 #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 "Network/EDisplayServerlist.h"
+#include "Core/World.h"
-#include "Network/EConnectRequest.h"
+#include "Core/EntityFile.h"
-#include "Network/EPlayerDisconnected.h"
+#include "Core/EventBroker.h"
-#include "Network/ESearchForServers.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/EWin.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"
 class Client : public Network
 {
 public:
@@ -46,7 +40,7 @@ public:
     ~Client();
 
     void Connect(std::string address, int port);
-    void Update(double dt) override;
+    void Update() override;
 private:
     UDPClient m_Unreliable;
     TCPClient m_Reliable;
@@ -80,10 +74,10 @@ private:
     // Network logic
     PlayerDefinition m_PlayerDefinitions[8];
     SnapshotDefinitions m_NextSnapshot;
-    double m_DurationOfPingTime = 0;
+    double m_DurationOfPingTime;
-    double m_StartPingTime = 0;
+    std::clock_t m_StartPingTime;
-    double m_TimeSinceSentInputs = 0;
+    std::clock_t m_TimeSinceSentInputs;
-    double m_SendInputInterval = 0.033;
+    unsigned int m_SendInputIntervalMs;
     std::vector<Events::InputCommand> m_InputCommandBuffer;
 
     // Private member functions
@@ -106,9 +100,6 @@ 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();
@@ -118,6 +109,7 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
     void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
@@ -146,8 +138,8 @@ private:
     UDPClient m_ServerlistRequest;
     std::vector<ServerInfo> m_Serverlist;
     bool m_SearchingForServers = false;
-    double m_TimeSearched = 0;
+    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 0.2; // Config I guess
+    double m_SearchingTime = 200; // Config I guess
 };
 
 #endif

include/Engine/Network/EKillDeath.h

@@ -10,19 +10,8 @@ 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,9 +23,6 @@ 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(double dt) = 0;
+    virtual void Update() = 0;
 
 protected:
     World* m_World;
@@ -40,7 +40,6 @@ protected:
     void saveToFile();
     void updateNetworkData();
     void popNetworkSegmentOfHeader(Packet& packet);
-    void removeWorld();
 };
 
 #endif

include/Engine/Network/Server.h

@@ -11,7 +11,6 @@
 #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"
@@ -25,8 +24,6 @@
 #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
 {
@@ -34,7 +31,7 @@ public:
     Server(World* world, EventBroker* eventBroker, int port);
     ~Server();
 
-    void Update(double dt) override;
+    void Update() override;
 
 private:
     // Network channels
@@ -44,7 +41,6 @@ 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;
@@ -52,14 +48,14 @@ private:
     char readBuffer[BUFFERSIZE] = { 0 };
     size_t bytesRead = 0;
     // time for previouse message
-    double previousPingMessage = 0;
+    std::clock_t previousePingMessage = std::clock();
-    double previousSnapshotMessage = 0;
+    std::clock_t previousSnapshotMessage = std::clock();
-    double timeOutTimer = 0;
+    std::clock_t timOutTimer = std::clock();
 
-    // How often we send messages (seconds)
+    // How often we send messages (milliseconds)
-    double pingInterval = 1;
+    float pingIntervalMs;
-    double snapshotInterval = 0.05;
+    float snapshotInterval;
-    double checkTimeOutInterval = 0.1;
+    int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
@@ -75,7 +71,6 @@ 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);
@@ -88,7 +83,6 @@ private:
     void kick(PlayerID player);
     PlayerID getPlayerIDFromEndpoint();
     PlayerID getPlayerIDFromEntityID(EntityID entityID);
-    void resetMap();
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -116,8 +110,6 @@ 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/AnimationSystem.h

@@ -16,7 +16,6 @@
 #include "../Core/EEntityDeleted.h"
 #include "Rendering/ESetBlendWeight.h"
 #include "imgui/imgui.h"
-#include "Input/EInputCommand.h"
 
 class AnimationSystem : public ImpureSystem
 {
@@ -38,13 +37,7 @@ private:
     EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
     bool OnSetBlendWeight(Events::SetBlendWeight& e);
 
-    EventRelay<AnimationSystem, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(Events::InputCommand& e);
-
     std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
-
-    bool Crouch = false;
-    float aimMove = 0;
 };
 
 #endif

include/Engine/Rendering/BlendTree.h

@@ -49,7 +49,9 @@ public:
                     next = next->Child[0];
                 }
             }
+
             return next;
+
         }
     };
 
@@ -80,7 +82,6 @@ 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/DrawFinalPass.h

@@ -17,7 +17,7 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass, ConfigFile* config);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass, SSAOPass* ssaoPass, ShadowPass* shadowPass);
 	~DrawFinalPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
@@ -25,77 +25,17 @@ 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() {
+    GLuint BloomTexture() const { return m_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 DrawFinalPass::SceneTexture() {
+    GLuint SceneTexture() const { return m_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() {
+    GLuint CombinedSceneTexture() const { return m_CombinedTexture; }
-		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() { 
+    GLuint FullBlurredTexture() const { return m_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);
@@ -116,21 +56,18 @@ private:
     Texture* m_GreyTexture;
     Texture* m_ErrorTexture;
 
-    FrameBuffer* m_FinalPassFrameBuffer = nullptr;
+    FrameBuffer m_FinalPassFrameBuffer;
-	FrameBuffer* m_ShieldDepthFrameBuffer = nullptr;
+	FrameBuffer m_ShieldDepthFrameBuffer;
-	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 = 0;
+    GLuint m_FullBlurredTexture;
-    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_CombinedTexture; //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,13 +7,12 @@
 class BufferResource
 {
 public:
-    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod, bool multiSampling);
+    BufferResource(GLuint* resourceHandle, GLenum resourceType, GLenum attachment, GLuint mipMapLod);
     
     GLuint* m_ResourceHandle;
     GLenum m_ResourceType;
     GLenum m_Attachment;
     GLuint m_MipMapLod = 0;
-	bool m_MultiSampling = false;
 private:
     
 };
@@ -22,33 +21,24 @@ template <GLenum RESOURCETYPE>
 class ResourceType : public BufferResource
 {
 public:
-    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod, bool multiSampling)
+    ResourceType(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod)
-        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod, multiSampling) { }
+        : BufferResource(resourceHandle, RESOURCETYPE, attachment, mipMapLod) { }
 };
 
 class Texture2D : public ResourceType<GL_TEXTURE_2D>
 {
 public:
     Texture2D(GLuint* resourceHandle, GLenum attachment, GLuint mipMapLod = 0)
-        : ResourceType(resourceHandle, attachment, mipMapLod, false) { };
+        : ResourceType(resourceHandle, attachment, mipMapLod) { };
 
     ~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, bool multiSampling = false)
+    RenderBuffer(GLuint* resourceHandle, GLenum attachment)
-        : ResourceType(resourceHandle, attachment, 0, multiSampling)
+        : ResourceType(resourceHandle, attachment, 0)
     { };
 
     ~RenderBuffer();
@@ -58,13 +48,12 @@ class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
 {
 public:
 	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
-		: ResourceType(resourceHandle, attachment, 0, false)
+		: ResourceType(resourceHandle, attachment, 0)
 	{ };
 
 	~Texture2DArray();
 };
 
-
 class FrameBuffer
 {
 public:
@@ -76,13 +65,9 @@ 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/Model.h

@@ -16,15 +16,18 @@ private:
 
 public:
 	~Model();
-    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_RawModel->m_Materials; }
+    const std::vector<RawModel::MaterialProperties>& MaterialGroups() const { return m_Materials; }
-    const glm::mat4& Matrix() const { return m_RawModel->m_Matrix; }
+    //const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
-    const RawModel::Vertex* Vertices() const { return m_RawModel->Vertices(); }
+	unsigned int NumberOfVertices() const { return m_Vertices.size(); }
-	unsigned int NumberOfVertices() const { return m_RawModel->NumVertices(); }
     const AABB& Box() const { return m_Box; }
-	bool IsSkinned() const { return m_RawModel->IsSkinned(); }
+	bool IsSkinned() const { return m_IsSkinned; }
 	GLuint VAO;
 	GLuint ElementBuffer;
-    RawModel* m_RawModel;
+    //RawModel* m_RawModel;
+
+    Skeleton* m_Skeleton = nullptr;
+    std::vector<glm::vec3> m_Vertices;
+    std::vector<unsigned int> m_Indices;
 
 private:
     AABB m_Box;
@@ -34,6 +37,9 @@ private:
 	GLuint TangentNormalsBuffer;
 	GLuint BiTangentNormalsBuffer;
 	GLuint TextureCoordBuffer;
+
+	std::vector<RawModel::MaterialProperties> m_Materials;
+    bool m_IsSkinned;
 };
 
 #endif

include/Engine/Rendering/ModelJob.h

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

include/Engine/Rendering/RawModelCustom.h

@@ -13,6 +13,7 @@
 
 #include <boost/filesystem/path.hpp>
 
+#include <boost/endian/buffers.hpp>
 #include "../Common.h"
 #include "../GLM.h"
 #include "../Core/ResourceManager.h"
@@ -20,14 +21,10 @@
 #include "Skeleton.h"
 #include "ShaderProgram.h"
 
-#include "boost\endian\buffers.hpp"
-
-
-
 class RawModelCustom : public Resource
 {
     friend class ResourceManager;
-
+    friend class Model;
 protected:
     RawModelCustom(std::string fileName);
 

include/Engine/Rendering/Renderer.h

@@ -71,7 +71,6 @@ 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/ShadowPass.h

@@ -69,7 +69,7 @@ private:
 	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
 	std::array<glm::mat4, MAX_SPLITS> m_LightView;
 
-	GLfloat m_NearFarPlane[2] = { -128.f, 128.f };
+	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
 	GLuint m_ResolutionSizeWidth = 1024 * 2;
 	GLuint m_ResolutionSizeHeight = 1024 * 2;
 

include/Engine/Rendering/Skeleton.h

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

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

include/Engine/Sound/SoundManager.h

@@ -30,7 +30,6 @@
 #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;
@@ -81,7 +80,6 @@ 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);
@@ -93,6 +91,7 @@ private:
     void matchBGMLoop();
     Source* m_CurrentBGM = nullptr;
     Source* m_CurrentBGMCombo = nullptr;
+    bool m_DrumLoopHasBeenStarted = false;
 
     // Logic
     World* m_World = nullptr;
@@ -140,8 +139,6 @@ 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

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

include/Game/Systems/CapturePointSystem.h

@@ -9,7 +9,6 @@
 #include "Engine/Collision/ETrigger.h"
 #include "Core/ECaptured.h"
 #include "Core/EWin.h"
-#include "Game/Events/EReset.h"
 
 #include <tuple>
 #include <vector>
@@ -24,7 +23,6 @@ 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);
@@ -32,8 +30,6 @@ 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

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

@@ -1,22 +0,0 @@
-#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 "Network/EKillDeath.h"
+#include "Core/EPlayerDeath.h"
 
 class KillFeedSystem : public ImpureSystem
 {
@@ -11,7 +11,8 @@ public:
     KillFeedSystem(SystemParams params)
         : System(params)
     {
-        EVENT_SUBSCRIBE_MEMBER(m_EKillDeath, &KillFeedSystem::OnPlayerKillDeath)
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
+
     }
 
     virtual void Update(double dt) override;
@@ -21,30 +22,16 @@ private:
 
 
 
-    EventRelay<KillFeedSystem, Events::KillDeath> m_EKillDeath;
+    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
-    bool KillFeedSystem::OnPlayerKillDeath(Events::KillDeath& e);
+    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
 
     struct KillFeedInfo
     {
-        std::string KillerName = "";
+        std::string Content;
-        int KillerClass = 0;
+        glm::vec4 Color;
-        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/PlayerMovementSystem.h

@@ -32,8 +32,6 @@ 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
@@ -48,6 +46,4 @@ 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 = 1,
+        Assault,
-        Defender = 2,
+        Defender,
-        Sniper = 2
+        Sniper
     };
     struct SpawnRequest
     {

include/Game/Systems/ScoreScreenSystem.h

@@ -8,8 +8,6 @@
 #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
@@ -27,10 +25,6 @@ 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

@@ -8,6 +8,7 @@
 #include "Events/ESpawnerSpawn.h"
 #include "Core/TransformSystem.h"
 #include "Core/EntityFile.h"
+#include "Rendering/Model.h"
 
 class SpawnerSystem : public System
 {
@@ -18,7 +19,6 @@ 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,7 +4,6 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
 #include "Network/EPlayerDisconnected.h"
-#include "Game/Events/EReset.h"
 
 class SpectatorCameraSystem : public ImpureSystem
 {
@@ -16,14 +15,11 @@ 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,14 +31,12 @@ 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,7 +6,6 @@
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Sound/EPlaySoundOnEntity.h"
-#include <glm/gtx/vector_angle.hpp>
 
 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {
@@ -24,24 +23,18 @@ 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, const std::vector<glm::vec2>& pattern);
+    void dealDamage(ComponentWrapper cWeapon, WeaponInfo& wi, glm::vec3 direction, double damage);
-    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,8 +4,6 @@
 #include "WeaponBehaviour.h"
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
-#include "Sound/EPlaySoundOnEntity.h"
-#include "Rendering/EAutoAnimationBlend.h"
 
 class SidearmWeaponBehaviour : public WeaponBehaviour<SidearmWeaponBehaviour>
 {
@@ -20,7 +18,6 @@ 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;
 
@@ -35,16 +32,6 @@ 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,8 +306,6 @@ private:
         wi.ThirdPersonEntity = thirdPersonWeapon;
         wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
-        player["Player"]["CurrentWeapon"] = cWeapon.Info.Name;
-
         OnEquip(cWeapon, wi);
     }
 

resources/DefaultConfig.ini

@@ -76,16 +76,13 @@ NumIterations=9
 TextureQuality=0
 
 [GLOW]
-Quality=1
+Quality=3
 
 [GLOW1]
-NumIterations=2
+NumIterations=5
 
 [GLOW2]
-NumIterations=4
+NumIterations=9
 
 [GLOW3]
-NumIterations=6
+NumIterations=13
-
-[MSAA]
-Level = 0;

resources/DefaultInput.ini

@@ -30,3 +30,5 @@ F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
 Comma=SwapToClassPick
 Period=SwapToTeamPick
+Enter=PickClass,1
+F5=DisconnectFromServer

resources/Schema/Components.xsd

@@ -68,9 +68,6 @@
 	<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>1.35</StrengthOfEffect>
+  <StrengthOfEffect>2</StrengthOfEffect>
 </BoostAssault>

resources/Schema/Components/Camera.xml

@@ -2,5 +2,5 @@
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
 	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
 	<NearClip>0.01</NearClip>
-	<FarClip>300</FarClip>
+	<FarClip>5000</FarClip>
 </Camera>

resources/Schema/Components/CapturePointGameMode.xml

@@ -2,5 +2,4 @@
 <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,9 +12,6 @@
 				<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>9999</MagazineAmmo>
+	<MagazineAmmo>8</MagazineAmmo>
 	<MagazineSize>8</MagazineSize>
 	<Ammo>64</Ammo>
 	<MaxAmmo>64</MaxAmmo>
 	<BaseDamage>90</BaseDamage>
-	<SpreadAngle>10</SpreadAngle>
+	<SpreadAngle>0.174533</SpreadAngle> <!-- 0.174533 = 10 degrees -->
 	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
-	<NumPellets>9</NumPellets>
+	<NumPellets>10</NumPellets>
 	<RPM>120</RPM>
-	<ViewPunch>0.15</ViewPunch>
+	<ViewPunch>0.03</ViewPunch>
-	<ViewReturnSpeed>0.3</ViewReturnSpeed>
+	<ViewReturnSpeed>0.2</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>The spread angle radius.</xs:documentation></xs:annotation>
+					<xs:annotation><xs:documentation>Spread angle in radians</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

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

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs: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

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

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="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,6 +1,2 @@
 <?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,12 +7,5 @@
 		<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,15 +6,11 @@
 	<BaseDamage>20</BaseDamage>
 	<RPM>500</RPM>
 	<Automatic>false</Automatic>
-	<ViewPunch>0.05</ViewPunch>
+	<ViewPunch>0.01</ViewPunch>
-	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
+	<ReloadTime>0.5</ReloadTime>
-	<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,12 +36,6 @@
 				<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>
@@ -50,10 +44,8 @@
 				</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,6 +10,5 @@
 	<KeepRatioY>false</KeepRatioY>
 	<KeepRatio>false</KeepRatio>
 	<Linear>true</Linear>
-	<ClampToBorder>false</ClampToBorder>
 	<BlurBackground>false</BlurBackground>
 </Sprite>

resources/Schema/Components/Sprite.xsd

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

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

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-	
-	<xs:element name="Unpickable">
-		<xs:annotation>
-			<xs:documentation>Makes the entity unpickable</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/10Degrees.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="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/AbilityDemo.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:SceneLight>
-      <AmbientColor A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-      <Gamma>1</Gamma>
-      <Exposure>0.82000017166137695</Exposure>
-    </c:SceneLight>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <GlowIntensity>1.0199999809265137</GlowIntensity>
-          <Resource>Models/Props/Walls/SciFiWallTop.mesh</Resource>
-          <Color A="1" B="3.92156863" G="1" R="1"/>
-          <Shadow>false</Shadow>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="58.718792" Z="15.6310005"/>
-          <Orientation X="0" Y="0" Z="3.14199996"/>
-          <Scale X="0.279000014" Y="1" Z="0.279000014"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <GlowIntensity>1.5</GlowIntensity>
-          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
-          <Shadow>false</Shadow>
-        </c:Model>
-        <c:Transform>
-          <Position X="-14.4384613" Y="-1.2316848" Z="0"/>
-          <Orientation X="0" Y="2.64800024" Z="0"/>
-          <Scale X="2" Y="3.60000014" Z="1.9000001"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Collidable/>
-        <c:Model>
-          <GlowIntensity>1.5</GlowIntensity>
-          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
-          <Shadow>false</Shadow>
-        </c:Model>
-        <c:Transform>
-          <Position X="14.3019333" Y="-1.12725353" Z="0"/>
-          <Orientation X="0" Y="3.84800029" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Dir">
-      <Components>
-        <c:DirectionalLight>
-          <Color A="1" B="0.725490212" G="0.75686276" R="0.741176486"/>
-          <Intensity>1.0699999332427979</Intensity>
-        </c:DirectionalLight>
-        <c:Transform>
-          <Orientation X="3.68318534" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Cam">
-      <Components>
-        <c:Camera/>
-        <c:Model>
-          <Resource>Models/Core/UnitSphere.mesh</Resource>
-          <Shadow>false</Shadow>
-          <NormalMap>false</NormalMap>
-          <DiffuseTexture>false</DiffuseTexture>
-          <SpecularMap>false</SpecularMap>
-          <GlowMap>false</GlowMap>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.100000001" Y="-0.0670000017" Z="-32.8670006"/>
-          <Orientation X="0" Y="3.1400001" Z="0"/>
-          <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Spawn">
-      <Components>
-        <c:PlayerSpawn>
-          <AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
-          <DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
-          <SniperFile></SniperFile>
-        </c:PlayerSpawn>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-        </c:Model>
-        <c:Spawner>
-          <EntityFile></EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.100000001" Y="2.8398931" Z="-29.0827847"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/AmmoShareEffectView.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>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

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

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

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

@@ -0,0 +1,13 @@
+<?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,37 +1,25 @@
 <?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">
+<Entity name="Shield" 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>
+      <Resource>Models/Characters/Defender/DefenderShield.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>
+          <AnimationName>ActivateDeactiveShieldF</AnimationName>
-              <Loop>false</Loop>
+          <Time>1</Time>
+          <Speed>1</Speed>
         </c:Animation>
         <c:Transform/>
       </Components>
@@ -40,58 +28,13 @@
     <Entity name="Idle">
       <Components>
         <c:Animation>
-              <AnimationName>ShieldFrontU</AnimationName>
+          <AnimationName>ShieldFrontF</AnimationName>
-              <Play>true</Play>
+          <Speed>1</Speed>
         </c:Animation>
         <c:Transform/>
       </Components>
       <Children/>
     </Entity>
   </Children>
-    </Entity>
-    <Entity name="Front">
-      <Components>
-        <c:Blend>
-          <Pose1>Deploy</Pose1>
-          <Pose2>Idle</Pose2>
-          <Weight>0</Weight>
-        </c:Blend>
-        <c:Model>
-          <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>ActivateShieldU</AnimationName>
-              <Loop>false</Loop>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Idle">
-          <Components>
-            <c:Animation>
-              <AnimationName>ShieldFrontU</AnimationName>
-              <Loop>false</Loop>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
 
 </Entity>

resources/Schema/Entities/EndScreen.xml

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

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

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

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

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>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,27 +1,28 @@
 <?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">
+<Entity name="MuzzleFlashBlue" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.08</Lifetime>
+      <Lifetime>0.039999999105930328</Lifetime>
     </c:Lifetime>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="Level1">
+    <Entity name="PlaneRight">
       <Components>
+        <c:Model>
+          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+        </c:Model>
         <c:Transform/>
       </Components>
-      <Children>
+      <Children/>
+    </Entity>
     <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>
@@ -32,12 +33,7 @@
     </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>
@@ -46,39 +42,9 @@
       </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>
@@ -87,40 +53,10 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <Entity name="Cone2Inside">
-    </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>
-              <GlowIntensity>2</GlowIntensity>
+          <Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
-              <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>
@@ -130,12 +66,7 @@
     </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>
@@ -146,12 +77,7 @@
     </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>
@@ -160,68 +86,17 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <Entity name="PlaneLeft">
-    </Entity>
-    <Entity name="Lights">
       <Components>
+        <c:Model>
+          <Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+        </c:Model>
         <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/MuzzleFlashFire.xml

@@ -9,15 +9,20 @@
   </Components>
 
   <Children>
-    <Entity name="Level1">
+    <Entity name="PlaneRight">
       <Components>
+        <c:Model>
+          <Resource>Models/Effects/MuzzleFlash/Fire/PlaneRight.mesh</Resource>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+        </c:Model>
         <c:Transform/>
       </Components>
-      <Children>
+      <Children/>
+    </Entity>
     <Entity name="Cone1Outside">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Fire/Cone1Outside.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -29,7 +34,6 @@
     <Entity name="Cone1Inside">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Fire/Cone1Inside.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -38,31 +42,9 @@
       </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>
@@ -71,32 +53,10 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <Entity name="Cone2Inside">
-    </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/Fire/Cone2Inside.mesh</Resource>
-              <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>
@@ -107,7 +67,6 @@
     <Entity name="PlaneUp">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Fire/PlaneUp.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -119,7 +78,6 @@
     <Entity name="PlaneDown">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Fire/PlaneDown.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -128,7 +86,16 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <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/>
     </Entity>
   </Children>
 

resources/Schema/Entities/MuzzleFlashGreen.xml

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

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

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

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

@@ -1,135 +0,0 @@
-<?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="MuzzleFlashFire" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="MuzzleFlashRed" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:Lifetime>
@@ -9,15 +9,20 @@
   </Components>
 
   <Children>
-    <Entity name="Level1">
+    <Entity name="PlaneRight">
       <Components>
+        <c:Model>
+          <Resource>Models/Effects/MuzzleFlash/Red/PlaneRight.mesh</Resource>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+        </c:Model>
         <c:Transform/>
       </Components>
-      <Children>
+      <Children/>
+    </Entity>
     <Entity name="Cone1Outside">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Red/Cone1Outside.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -29,7 +34,6 @@
     <Entity name="Cone1Inside">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Red/Cone1Inside.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -38,31 +42,9 @@
       </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>
@@ -71,32 +53,10 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <Entity name="Cone2Inside">
-    </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/Red/Cone2Inside.mesh</Resource>
-              <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>
@@ -107,7 +67,6 @@
     <Entity name="PlaneUp">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Red/PlaneUp.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -119,7 +78,6 @@
     <Entity name="PlaneDown">
       <Components>
         <c:Model>
-              <GlowIntensity>2</GlowIntensity>
           <Resource>Models/Effects/MuzzleFlash/Red/PlaneDown.mesh</Resource>
           <Shadow>false</Shadow>
           <Transparent>true</Transparent>
@@ -128,7 +86,16 @@
       </Components>
       <Children/>
     </Entity>
-      </Children>
+    <Entity name="PlaneLeft">
+      <Components>
+        <c:Model>
+          <Resource>Models/Effects/MuzzleFlash/Red/PlaneLeft.mesh</Resource>
+          <Shadow>false</Shadow>
+          <Transparent>true</Transparent>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
     </Entity>
   </Children>
 

resources/Schema/Entities/MuzzleFlashSideArmBlue.xml

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

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

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

@@ -1,868 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="PlayerAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:SidearmWeapon>
-      <BaseDamage>10</BaseDamage>
-    </c:SidearmWeapon>
-    <c:Health/>
-    <c:NetworkComponent/>
-    <c:Physics>
-      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
-    </c:Physics>
-    <c:Player>
-      <MovementSpeed>5</MovementSpeed>
-      <CurrentWeapon></CurrentWeapon>
-    </c:Player>
-    <c:Transform>
-      <Position X="-0.5" Y="0" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:BlendOverride>
-          <Master>BlendTreeUpper</Master>
-          <Slave>BlendTreeLower</Slave>
-        </c:BlendOverride>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <GlowIntensity>2.2000000476837158</GlowIntensity>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Orientation X="0" Y="0.467000008" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.159274966" Y="1.03443384" Z="-0.235393077"/>
-              <Orientation X="-0.0276949964" Y="-0.0416635424" Z="0.131935105"/>
-            </c:Transform>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-          </Components>
-          <Children>
-            <Entity name="AssaultWeapon">
-              <Components>
-                <c:Shielded/>
-                <c:Model>
-                  <GlowIntensity>1.5</GlowIntensity>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                </c:Model>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="ReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="Muzzle">
-                  <Components>
-                    <c:Transform>
-                      <Position X="0.00728808995" Y="0.0896582007" Z="-0.643795013"/>
-                      <Orientation X="6.27600002" Y="0.00499999989" Z="0.00600000005"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="WeaponMuzzleFlash">
-                      <Components>
-                        <c:Spawner>
-                          <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
-                        </c:Spawner>
-                        <c:Transform>
-                          <Position X="-8.41593719e-05" Y="-0.000816107844" Z="0.0612007342"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="WeaponMuzzleRay">
-                      <Components>
-                        <c:Spawner>
-                          <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
-                        </c:Spawner>
-                        <c:Transform>
-                          <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.159274966" Y="1.03443384" Z="-0.235393077"/>
-              <Orientation X="-0.0276949964" Y="-0.0416635424" Z="0.131935105"/>
-            </c:Transform>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="BlendTreeLower">
-          <Components>
-            <c:Blend>
-              <Pose1>MovementBlend</Pose1>
-              <Pose2>JumpDashBlend</Pose2>
-              <Weight>2.5146881298480398e-63</Weight>
-              <SubTreeRoot>true</SubTreeRoot>
-            </c:Blend>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="MovementBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>StandMovement</Pose1>
-                  <Pose2>CrouchMovement</Pose2>
-                  <Weight>0</Weight>
-                  <SubTreeRoot>true</SubTreeRoot>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="CrouchMovement">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>DirectionBlend</Pose1>
-                      <Pose2>Idle</Pose2>
-                      <Weight>1</Weight>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="DirectionBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>Walk</Pose1>
-                          <Pose2>StrafeLRBlend</Pose2>
-                          <Weight>0</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="StrafeLRBlend">
-                          <Components>
-                            <c:Blend>
-                              <Pose1>Left</Pose1>
-                              <Pose2>Right</Pose2>
-                              <Weight>0.033793529385008014</Weight>
-                            </c:Blend>
-                            <c:Transform/>
-                          </Components>
-                          <Children>
-                            <Entity name="Left">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                  <Time>0.44988618375479206</Time>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="Right">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.37720764570557463</Time>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
-                        <Entity name="Walk">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.15558163088297761</Time>
-                              <Play>true</Play>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Idle">
-                      <Components>
-                        <c:Animation>
-                          <AnimationName>CrouchF</AnimationName>
-                          <Time>1.8288091278296688</Time>
-                          <Play>true</Play>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="StandMovement">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>DirectionBlend</Pose1>
-                      <Pose2>Idle</Pose2>
-                      <Weight>1</Weight>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="DirectionBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>RunWalkBlend</Pose1>
-                          <Pose2>StrafeLRBlend</Pose2>
-                          <Weight>2.4565650245976452e-16</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="RunWalkBlend">
-                          <Components>
-                            <c:Blend>
-                              <Pose1>Walk</Pose1>
-                              <Pose2>Run</Pose2>
-                              <Weight>1.2938206818383024e-24</Weight>
-                            </c:Blend>
-                            <c:Transform/>
-                          </Components>
-                          <Children>
-                            <Entity name="Walk">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>WalkF</AnimationName>
-                                  <Time>0.84192543677924192</Time>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="Run">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>RunF</AnimationName>
-                                  <Time>0.28035050282109175</Time>
-                                  <Speed>2</Speed>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
-                        <Entity name="StrafeLRBlend">
-                          <Components>
-                            <c:Blend>
-                              <Pose1>Left</Pose1>
-                              <Pose2>Right</Pose2>
-                              <Weight>0.033793529385008014</Weight>
-                            </c:Blend>
-                            <c:Transform/>
-                          </Components>
-                          <Children>
-                            <Entity name="Left">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.88305913822256876</Time>
-                                  <Speed>2</Speed>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="Right">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.96047014705853506</Time>
-                                  <Speed>2</Speed>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Idle">
-                      <Components>
-                        <c:Animation>
-                          <AnimationName>IdleF</AnimationName>
-                          <Time>1.7574641124802284</Time>
-                          <Play>true</Play>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="JumpDashBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>Jump</Pose1>
-                  <Pose2>DashBlend</Pose2>
-                  <Weight>1</Weight>
-                  <SubTreeRoot>true</SubTreeRoot>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="Jump">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>JumpF</AnimationName>
-                      <Time>0.5</Time>
-                      <Loop>false</Loop>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="DashBlend">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>DashFBBlend</Pose1>
-                      <Pose2>DashLRBlend</Pose2>
-                      <Weight>0.014621149736541383</Weight>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="DashFBBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>DashForward</Pose1>
-                          <Pose2>DashBackward</Pose2>
-                          <Weight>0.014363533804961248</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="DashForward">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>DashForwardF</AnimationName>
-                              <Time>1</Time>
-                              <Speed>1.7999999523162842</Speed>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="DashBackward">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>DashBackwardF</AnimationName>
-                              <Time>1</Time>
-                              <Speed>1.7999999523162842</Speed>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="DashLRBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>DashLeft</Pose1>
-                          <Pose2>DashRight</Pose2>
-                          <Weight>4.3244885367500671e-16</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="DashLeft">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>DashLeftF</AnimationName>
-                              <Time>1</Time>
-                              <Speed>1.7999999523162842</Speed>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="DashRight">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>DashRightF</AnimationName>
-                              <Time>1</Time>
-                              <Speed>1.7999999523162842</Speed>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BlendTreeUpper">
-          <Components>
-            <c:Blend>
-              <Pose1>AssaultWeapon</Pose1>
-              <Pose2>SidearmWeapon</Pose2>
-              <Weight>0</Weight>
-              <SubTreeRoot>true</SubTreeRoot>
-            </c:Blend>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="AssaultWeapon">
-              <Components>
-                <c:BlendAdditive>
-                  <Adder>Aim</Adder>
-                  <Receiver>WeaponBlend</Receiver>
-                </c:BlendAdditive>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="WeaponBlend">
-                  <Components>
-                    <c:BlendAdditive>
-                      <Adder>IdleAssault</Adder>
-                      <Receiver>ActionBlend</Receiver>
-                    </c:BlendAdditive>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="ActionBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>Fire</Pose1>
-                          <Pose2>Reload</Pose2>
-                          <Weight>1</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Reload">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>ReloadSwitchU</AnimationName>
-                              <Speed>0.5</Speed>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Fire">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>ShootFastRifleU</AnimationName>
-                              <Loop>false</Loop>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="IdleAssault">
-                      <Components>
-                        <c:Animation>
-                          <AnimationName>IdleAssaultRifleU</AnimationName>
-                          <Time>1.4730651229275153</Time>
-                          <Play>true</Play>
-                          <Additive>true</Additive>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Aim">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>AimRifleA</AnimationName>
-                      <Time>0.5</Time>
-                      <Speed>0.10000000149011612</Speed>
-                      <Loop>false</Loop>
-                      <Additive>true</Additive>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </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.0641395152" Y="0.971834779" Z="-0.393912911"/>
-                  <Orientation X="-2.71834111" Y="-1.16788483" Z="-2.30780911"/>
-                </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.311632752" Y="1.00616109" Z="-0.0154332817"/>
-                  <Orientation X="1.7501713" Y="1.40668344" Z="0.63290441"/>
-                </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.0810014606" Y="1.25193644" Z="-0.150023431"/>
-                  <Orientation X="-0.278524429" Y="-0.110433489" Z="-0.180452675"/>
-                </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.188116193" Y="0.722146571" Z="0.020738611"/>
-                  <Orientation X="0.68511039" Y="-0.00414709467" Z="-0.0733199194"/>
-                </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.149692252" Y="0.745154798" Z="0.0894331336"/>
-                  <Orientation X="-0.00521934591" Y="-0.594766259" Z="0.242353484"/>
-                </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.184227288" Y="0.324282408" Z="0.0380233303"/>
-                  <Orientation X="-0.709708989" Y="-0.647283316" Z="0.337633669"/>
-                </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>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/PlayerAssaultBlue.xml

@@ -14,10 +14,12 @@
     </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>
@@ -28,6 +30,7 @@
       <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>
@@ -57,14 +60,6 @@
           </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>
@@ -75,10 +70,9 @@
             <Entity name="Crosshair">
               <Components>
                 <c:Sprite>
-                      <DepthSort>false</DepthSort>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -107,10 +101,8 @@
                 <Entity name="BackgroundHexagon">
                   <Components>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -127,10 +119,8 @@
                           <CapturePointNumber>2</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -145,10 +135,8 @@
                 <Entity name="BackgroundHexagon">
                   <Components>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -165,10 +153,8 @@
                           <CapturePointNumber>3</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -183,10 +169,8 @@
                 <Entity name="BackgroundHexagon">
                   <Components>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -204,10 +188,8 @@
                           <CapturePointNumber>4</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -222,10 +204,8 @@
                 <Entity name="BackgroundHexagon">
                   <Components>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -242,10 +222,8 @@
                           <CapturePointNumber>1</CapturePointNumber>
                         </c:CapturePointHUD>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -260,10 +238,8 @@
                 <Entity name="BackgroundHexagon">
                   <Components>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -279,10 +255,8 @@
                         </c:Fill>
                         <c:CapturePointHUD/>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -309,7 +283,7 @@
                   <Components>
                     <c:Text>
                       <Content></Content>
-                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
                       </Alignment>
@@ -322,7 +296,7 @@
                   <Components>
                     <c:Text>
                       <Content></Content>
-                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
                       </Alignment>
@@ -337,7 +311,7 @@
                   <Components>
                     <c:Text>
                       <Content></Content>
-                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Alignment>
                         <Right/>
                       </Alignment>
@@ -359,12 +333,12 @@
                 </c:Team>
                 <c:CapturePointArrowHUD/>
                 <c:Model>
-                      <Resource>Models/Widgets/Arrows/ArrowBlue.mesh</Resource>
+                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                      <Position X="0" Y="0.198665127" Z="0"/>
+                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                      <Orientation X="0.0531693883" Y="-2.13055706" Z="0"/>
+                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                      <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -383,12 +357,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="1.56862748" G="1.17647064" R="0"/>
+                      <Color A="0.505882382" B="3.92156863" 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"/>
@@ -405,9 +379,8 @@
                     </c:Fill>
                     <c:HealthHUD/>
                     <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -427,17 +400,16 @@
                     <Entity name="Assault">
                       <Components>
                         <c:Fill>
-                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
+                          <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
                         </c:Fill>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <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"/>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                          <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
                         </c:Sprite>
                         <c:Transform>
-                              <Position X="0.0250000004" Y="0.0650000051" Z="0"/>
+                          <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
                           <Orientation X="0" Y="0" Z="3.14199996"/>
                           <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
                         </c:Transform>
@@ -447,17 +419,16 @@
                     <Entity name="Defender">
                       <Components>
                         <c:Fill>
-                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
+                          <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
                         </c:Fill>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <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"/>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                          <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
                         </c:Sprite>
                         <c:Transform>
-                              <Position X="0.0240000002" Y="0.104000002" Z="0"/>
+                          <Position X="0.0270000007" Y="0.110000007" Z="0"/>
                           <Orientation X="0" Y="0" Z="3.14199996"/>
                           <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
                         </c:Transform>
@@ -467,17 +438,16 @@
                     <Entity name="Sniper">
                       <Components>
                         <c:Fill>
-                              <Color A="1" B="1.96078432" G="0.784313738" R="0"/>
+                          <Color A="1" B="0.345098048" G="0" R="1"/>
                         </c:Fill>
                         <c:Sprite>
-                              <DepthSort>false</DepthSort>
-                              <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"/>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                          <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
                         </c:Sprite>
                         <c:Transform>
-                              <Position X="0.0240000002" Y="0.145000011" Z="0"/>
+                          <Position X="0.0250000004" 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>
@@ -493,16 +463,30 @@
                       <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
                     </c:Fill>
                     <c:Sprite>
-                          <DepthSort>false</DepthSort>
+                      <DiffuseTexture>Textures\Icons\Abilities\Superman-01.png</DiffuseTexture>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
                       <GlowMap></GlowMap>
-                          <DiffuseTexture>Textures/Icons/Abilities/Long/Superman-01.png</DiffuseTexture>
+                      <DepthSort>false</DepthSort>
-                          <Color A="1" B="0.20784314" G="1.17647064" R="0.192156866"/>
+                      <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
-                          <Orientation X="0" Y="0" Z="1.57000005"/>
+                      <Orientation X="0" Y="0" Z="3.14159203"/>
-                          <Scale X="0.0800000057" Y="0.029000001" Z="1"/>
+                      <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"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -533,11 +517,11 @@
             <Entity name="SecondaryAttachment">
               <Components>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponSidearmAssaultBlueView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/WeaponDefenderBlueView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform/>
                 <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
+                  <Weapon>DefenderWeapon</Weapon>
                 </c:WeaponAttachment>
               </Components>
               <Children/>
@@ -572,7 +556,6 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
-          <GlowIntensity>2.2000000476837158</GlowIntensity>
           <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
         </c:Model>
         <c:Transform/>
@@ -587,8 +570,8 @@
               <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
+              <Position X="0.17052114" Y="1.03320956" Z="-0.224843055"/>
-              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
+              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
@@ -605,11 +588,11 @@
               <BoneName>R_Arm_Weapon_Joint</BoneName>
             </c:BoneAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
+              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
+              <Position X="0.17052114" Y="1.03320956" Z="-0.224843055"/>
-              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
+              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>SidearmWeapon</Weapon>
@@ -676,7 +659,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                  <Time>0.47961568648540975</Time>
+                                  <Time>0.79179726223533642</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -687,7 +670,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.40693714843619233</Time>
+                                  <Time>0.719118724186119</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -700,7 +683,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.1853111336135953</Time>
+                              <Time>0.49749270936352197</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -713,7 +696,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>CrouchF</AnimationName>
-                          <Time>1.8585386305602865</Time>
+                          <Time>1.1707202063102131</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -756,7 +739,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                  <Time>0.87165493950985962</Time>
+                                  <Time>0.0026473387732952602</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -767,7 +750,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                  <Time>0.33980950828232714</Time>
+                                  <Time>0.60179430680919843</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -791,7 +774,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.94251814368380415</Time>
+                                  <Time>0.20450294221067544</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -803,7 +786,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.019929152519770454</Time>
+                                  <Time>0.28191395104664174</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -819,7 +802,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                          <Time>0.55386718012173475</Time>
+                          <Time>0.96819454985941356</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -943,7 +926,7 @@
         <Entity name="BlendTreeUpper">
           <Components>
             <c:Blend>
-              <Pose1>AssaultWeapon</Pose1>
+              <Pose1>AssaultWeaponBlend</Pose1>
               <Pose2>SidearmWeapon</Pose2>
               <Weight>0</Weight>
               <SubTreeRoot>true</SubTreeRoot>
@@ -951,7 +934,7 @@
             <c:Transform/>
           </Components>
           <Children>
-            <Entity name="AssaultWeapon">
+            <Entity name="AssaultWeaponBlend">
               <Components>
                 <c:BlendAdditive>
                   <Adder>Aim</Adder>
@@ -963,7 +946,7 @@
                 <Entity name="WeaponBlend">
                   <Components>
                     <c:BlendAdditive>
-                      <Adder>IdleAssault</Adder>
+                      <Adder>MovementBlend</Adder>
                       <Receiver>ActionBlend</Receiver>
                     </c:BlendAdditive>
                     <c:Transform/>
@@ -1002,11 +985,21 @@
                         </Entity>
                       </Children>
                     </Entity>
-                    <Entity name="IdleAssault">
+                    <Entity name="MovementBlend2">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Idle</Pose1>
+                          <Pose2>Run</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Run">
                           <Components>
                             <c:Animation>
                               <AnimationName>IdleAssaultRifleU</AnimationName>
-                          <Time>1.502794625658133</Time>
+                              <Time>1.6337870249215687</Time>
                               <Play>true</Play>
                               <Additive>true</Additive>
                             </c:Animation>
@@ -1014,6 +1007,20 @@
                           </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">
@@ -1031,308 +1038,6 @@
                 </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>
@@ -1382,10 +1087,9 @@
     <Entity name="Indicator">
       <Components>
         <c:Sprite>
-          <DepthSort>false</DepthSort>
-          <Model>Models/Core/UnitQuad.mesh</Model>
-          <GlowMap></GlowMap>
           <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
           <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Sprite>
         <c:HiddenForLocalPlayer/>

resources/Schema/Entities/PlayerHUD.xml

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

resources/Schema/Entities/QualityAssurance.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:CapturePointGameMode>
-      <RespawnTime>6.5024371606521605</RespawnTime>
+      <RespawnTime>3.6154132075906489</RespawnTime>
     </c:CapturePointGameMode>
     <c:Transform>
       <Position X="0" Y="-1" Z="0"/>
@@ -11,15 +11,6 @@
   </Components>
 
   <Children>
-    <Entity name="CamOrigin">
-      <Components>
-        <c:Camera/>
-        <c:Transform>
-          <Position X="0" Y="1" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="AnimationTestOrigin">
       <Components>
         <c:Transform>
@@ -78,6 +69,15 @@
             </c:Transform>
           </Components>
           <Children>
+            <Entity name="Light">
+              <Components>
+                <c:PointLight/>
+                <c:Transform>
+                  <Position X="0" Y="0.663784981" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
             <Entity name="RotationOrigin">
               <Components>
                 <c:RaptorCopter>
@@ -85,7 +85,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2974.37671" Z="0"/>
+                  <Orientation X="0" Y="2907.64526" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -105,15 +105,6 @@
                 </Entity>
               </Children>
             </Entity>
-            <Entity name="Light">
-              <Components>
-                <c:PointLight/>
-                <c:Transform>
-                  <Position X="0" Y="0.663784981" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
       </Children>
@@ -150,7 +141,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="9274.77051" Z="0"/>
+              <Orientation X="0" Y="9141.29785" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -203,7 +194,7 @@
         </c:Model>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="19113.9609" Z="0"/>
+          <Orientation X="4.16300011" Y="18980.4727" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -231,7 +222,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="17704.4414" Y="17704.4414" Z="17704.4414"/>
+              <Orientation X="17570.9531" Y="17570.9531" Z="17570.9531"/>
             </c:Transform>
           </Components>
           <Children>
@@ -295,7 +286,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="17500.4375" Z="0"/>
+              <Orientation X="0" Y="17366.9492" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -327,7 +318,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="12795.8896" Y="18227.8477" Z="5454.55518"/>
+                      <Orientation X="12702.4932" Y="18094.3594" Z="5414.53027"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -650,52 +641,6 @@
         </c:Transform>
       </Components>
       <Children>
-        <Entity name="AssetBase">
-          <Components>
-            <c:Model>
-              <Resource>Models/Core/UnitCylinder.mesh</Resource>
-              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
-            </c:Model>
-            <c:Transform>
-              <Position X="-2.27346039" Y="-0.231354833" Z="-0.0611162409"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Light">
-              <Components>
-                <c:PointLight/>
-                <c:Transform>
-                  <Position X="0" Y="0.663784981" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="RotationOrigin">
-              <Components>
-                <c:RaptorCopter>
-                  <Speed>0.5</Speed>
-                  <Axis X="0" Y="1" Z="0"/>
-                </c:RaptorCopter>
-                <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Asset">
-                  <Components>
-                    <c:Model>
-                      <Resource>Models/Test/AssaultTPoseSoftEdge.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="0" Y="0.5" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
         <Entity name="AssetBase">
           <Components>
             <c:Model>
@@ -723,7 +668,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -770,7 +715,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -830,7 +775,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -850,6 +795,52 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="AssetBase">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1.56862748" G="1.56862748" R="1.56862748"/>
+            </c:Model>
+            <c:Transform>
+              <Position X="-2.27346039" Y="-0.231354833" Z="-0.0611162409"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Light">
+              <Components>
+                <c:PointLight/>
+                <c:Transform>
+                  <Position X="0" Y="0.663784981" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="RotationOrigin">
+              <Components>
+                <c:RaptorCopter>
+                  <Speed>0.5</Speed>
+                  <Axis X="0" Y="1" Z="0"/>
+                </c:RaptorCopter>
+                <c:Transform>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Asset">
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Test/AssaultTPoseSoftEdge.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.5" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
         <Entity name="AssetBase">
           <Components>
             <c:Model>
@@ -877,7 +868,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -924,7 +915,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -971,7 +962,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1272.14539" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1036,6 +1027,7 @@
                     <Red/>
                   </Team>
                 </c:Team>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="0" G="0" R="1"/>
@@ -1045,7 +1037,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1082,6 +1073,7 @@
                   <CapturePointNumber>1</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Team/>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1091,7 +1083,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1126,6 +1117,7 @@
                   <CapturePointNumber>2</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Team/>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1135,7 +1127,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1172,6 +1163,7 @@
                   <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Team/>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="1" R="1"/>
@@ -1181,7 +1173,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1226,6 +1217,7 @@
                     <Blue/>
                   </Team>
                 </c:Team>
+                <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="0" R="0"/>
@@ -1235,7 +1227,6 @@
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
                 </c:Transform>
-                <c:Trigger/>
               </Components>
               <Children/>
             </Entity>
@@ -1385,19 +1376,19 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1805.87231" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
                     <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>1.3579803859829696</TimeSinceDeath>
+                      <TimeSinceDeath>1.5712751414989441</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
-                      <ColorByDistance>true</ColorByDistance>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
@@ -1441,7 +1432,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1805.87231" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1450,7 +1441,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>0.79164215554514783</TimeSinceDeath>
+                      <TimeSinceDeath>0.85439856235552725</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1493,7 +1484,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1805.87231" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1503,12 +1494,12 @@
                       <AnimationName></AnimationName>
                     </c:Animation>
                     <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>0.79164215554514783</TimeSinceDeath>
+                      <TimeSinceDeath>0.85439856235552725</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
-                      <ColorByDistance>true</ColorByDistance>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
@@ -1551,21 +1542,21 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1813.65247" Z="0"/>
+                  <Orientation X="0" Y="1746.92322" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
                     <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>7.7876951610054306</TimeSinceDeath>
+                      <TimeSinceDeath>7.5223549108000043</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
                       <Randomness>true</Randomness>
-                      <ColorByDistance>true</ColorByDistance>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Core/UnitSphere.mesh</Resource>
@@ -1609,20 +1600,20 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1411.76697" Z="0"/>
+                  <Orientation X="0" Y="1345.03772" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
                     <c:ExplosionEffect>
+                      <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>2.6357521906414902</TimeSinceDeath>
+                      <TimeSinceDeath>0.39702717854592606</TimeSinceDeath>
+                      <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
-                      <ColorByDistance>true</ColorByDistance>
-                      <ExponentialAccelaration>true</ExponentialAccelaration>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Assault.mesh</Resource>
@@ -1800,12 +1791,12 @@
                     <Entity name="Weapon">
                       <Components>
                         <c:ExplosionEffect>
+                          <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>1.3579803859829696</TimeSinceDeath>
+                          <TimeSinceDeath>1.5712751414989441</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
-                          <ColorByDistance>true</ColorByDistance>
                         </c:ExplosionEffect>
                         <c:Model>
                           <Resource>Models/AssaultWeaponRed.mesh</Resource>
@@ -1948,9 +1939,8 @@
         <Entity name="Sprite1">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
+              <GlowMap></GlowMap>
             </c:Sprite>
             <c:Transform/>
           </Components>
@@ -1959,9 +1949,8 @@
         <Entity name="Sprite2">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Props/FoliageDiff.png</DiffuseTexture>
+              <GlowMap></GlowMap>
             </c:Sprite>
             <c:Transform>
               <Position X="-0.177861199" Y="0" Z="-1.04673338"/>
@@ -1981,9 +1970,8 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2000,9 +1988,8 @@
                   <CapturePointNumber>2</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <Model>Models/Core/UnitQuad.mesh</Model>
-                  <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2017,9 +2004,8 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2036,9 +2022,8 @@
                   <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <Model>Models/Core/UnitQuad.mesh</Model>
-                  <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2053,9 +2038,8 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Sprite>
             <c:Transform>
@@ -2073,9 +2057,8 @@
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <Model>Models/Core/UnitQuad.mesh</Model>
-                  <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2090,9 +2073,8 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.300000012" B="1" G="1" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2109,9 +2091,8 @@
                   <CapturePointNumber>1</CapturePointNumber>
                 </c:CapturePointHUD>
                 <c:Sprite>
-                  <Model>Models/Core/UnitQuad.mesh</Model>
-                  <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2126,9 +2107,8 @@
         <Entity name="BackgroundHexagon">
           <Components>
             <c:Sprite>
-              <Model>Models/Core/UnitQuad.mesh</Model>
-              <GlowMap></GlowMap>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
               <Color A="0.699999988" B="0" G="0" R="1"/>
             </c:Sprite>
             <c:Transform>
@@ -2144,9 +2124,8 @@
                 </c:Fill>
                 <c:CapturePointHUD/>
                 <c:Sprite>
-                  <Model>Models/Core/UnitQuad.mesh</Model>
-                  <GlowMap></GlowMap>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -2194,7 +2173,7 @@
     <Entity name="MenuOirign">
       <Components>
         <c:Transform>
-          <Position X="-6.60000038" Y="0.600000024" Z="-1.86100006"/>
+          <Position X="0" Y="0.600000024" Z="-1.86100006"/>
         </c:Transform>
       </Components>
       <Children>
@@ -2224,9 +2203,8 @@
                 <Entity name="MenuBackground">
                   <Components>
                     <c:Sprite>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0" Y="0" Z="-1"/>
@@ -2237,9 +2215,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.388422519" Z="0.0627754927"/>
@@ -2267,9 +2244,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.214031488" Z="0.0627754927"/>
@@ -2297,9 +2273,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
@@ -2327,9 +2302,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
@@ -2357,9 +2331,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
@@ -2400,10 +2373,9 @@
                 <Entity name="MenuBackground">
                   <Components>
                     <c:Sprite>
-                      <Model>Models/Core/UnitQuad.mesh</Model>
-                      <GlowMap></GlowMap>
                       <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
                       <BlurBackground>true</BlurBackground>
+                      <GlowMap></GlowMap>
                       <Color A="0" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -2415,9 +2387,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                           <Visible>false</Visible>
                         </c:Sprite>
                         <c:Transform>
@@ -2447,9 +2418,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                           <Visible>false</Visible>
                         </c:Sprite>
                         <c:Transform>
@@ -2479,9 +2449,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
@@ -2509,9 +2478,8 @@
                       <Components>
                         <c:Button/>
                         <c:Sprite>
-                          <Model>Models/Core/UnitQuad.mesh</Model>
-                          <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="-0.164955258" Z="0.0627754927"/>

resources/Schema/Entities/RayAssaultBlue.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="RayBlue" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Lifetime>
-      <Lifetime>0.079999998211860657</Lifetime>
-    </c:Lifetime>
-    <c:NetworkComponent/>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Sprite>
-          <Model>Models/Core/UnitQuad.mesh</Model>
-          <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
-          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
-          <KeepRatio>true</KeepRatio>
-        </c:Sprite>
-        <c:Transform>
-          <Orientation X="0" Y="-1.57099998" Z="0"/>
-          <Scale X="1" Y="0.0700000003" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Sprite>
-          <Model>Models/Core/UnitQuad.mesh</Model>
-          <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
-          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
-          <KeepRatio>true</KeepRatio>
-        </c:Sprite>
-        <c:Transform>
-          <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
-          <Scale X="1" Y="0.0700000003" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/RayBlue.xml

@@ -3,26 +3,25 @@
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.079999998211860657</Lifetime>
+      <Lifetime>0.10000000149011612</Lifetime>
     </c:Lifetime>
-    <c:Transform/>
+    <c:Transform>
+      <Scale X="0" Y="1" Z="1"/>
+    </c:Transform>
   </Components>
 
   <Children>
     <Entity>
       <Components>
         <c:Sprite>
-          <Model>Models/Core/UnitQuad.mesh</Model>
+          <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
           <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
+          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
-          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
-          <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </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.0700000003" Z="0"/>
+          <Scale X="1" Y="0.0260000005" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -30,17 +29,14 @@
     <Entity>
       <Components>
         <c:Sprite>
-          <Model>Models/Core/UnitQuad.mesh</Model>
+          <DiffuseTexture>Textures/Effects/Ray.png</DiffuseTexture>
           <GlowMap></GlowMap>
-          <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
+          <Color A="0.419607848" B="3.92156863" G="0.270588249" R="0"/>
-          <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
-          <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </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.0700000003" Z="0"/>
+          <Scale X="1" Y="0.0260000005" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>