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

# Conflicts:
#	resources/Schema/Components/ExplosionEffect.xml
#	resources/Shaders/ExplosionEffect.geom.glsl
#	src/Game/Systems/ExplosionEffectSystem.cpp

include/Engine/Core/EntityWrapper.h

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

include/Engine/Input/FirstPersonInputController.h

@@ -7,6 +7,7 @@
 #include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
 #include "Rendering/EAutoAnimationBlend.h"
+#include "Rendering/ESetBlendWeight.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
@@ -45,7 +46,6 @@ protected:
     bool m_Crouching = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
-    double m_DashEffectResetTimer = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
     //and its very unlikely that someone wants to change that value
     const float m_AssaultDashDoubleTapSensitivityTimer = 0.25f;
@@ -110,7 +110,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     if (e.Command == "Pitch") {
         float val = glm::radians(e.Value);
         m_Rotation.x += -val;
-        //m_Rotation.x = glm::clamp(m_Rotation.x, -glm::half_pi<float>(), glm::half_pi<float>());
     }
 
     if (e.Command == "Yaw") {
@@ -123,22 +122,11 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.z = -val;
 
+            //Animation
             if (m_PlayerEntity.Valid()) {
                 EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
                 if (playerModel.Valid()) {
-                    if (val > 0) {
-                        Events::AutoAnimationBlend aeb;
-                        aeb.Duration = 0.1;
-
-                        if(m_Crouching) {
-                            aeb.NodeName = "Walk";
-                        } else {
-                            aeb.NodeName = "Run";
-                        }
-                        aeb.RootNode = playerModel;
-                        aeb.Start = true;
-                        m_EventBroker->Publish(aeb);
-                    } else if (val < 0) {
+                    if (val > 0) {  // Walk/Run
                         Events::AutoAnimationBlend aeb;
                         aeb.Duration = 0.1;
                         if (m_Crouching) {
@@ -148,10 +136,46 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                         }
                         aeb.RootNode = playerModel;
                         aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) {   // Walk/run Backwards
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.SingleLevelBlend = true;
                         aeb.Reverse = true;
                         m_EventBroker->Publish(aeb);
-                    } else {
+                    }
+                }
 
+
+                EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+                if (firstPersonModel.Valid()) {
+                    if (val > 0) {  // Walk/Run
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            m_EventBroker->Publish(aeb);
+                        }
+                    } else if (val < 0) {   // Walk/run Backwards
+                        if (!m_Crouching) {
+                            Events::AutoAnimationBlend aeb;
+                            aeb.Duration = 0.1;
+                            aeb.NodeName = "Run";
+                            aeb.RootNode = firstPersonModel;
+                            aeb.Start = true;
+                            aeb.Reverse = true;
+                            m_EventBroker->Publish(aeb);
+                        }
                     }
                 }
             }
@@ -160,48 +184,91 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.x = val;
 
+
+            //Animation
             if (m_PlayerEntity.Valid()) {
                 EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-
-                if (playerModel.Valid()) {
+                if (playerModel.Valid()) { //Right Strafe
                     if (val > 0) {
                         Events::AutoAnimationBlend aeb;
                         aeb.Duration = 0.1;
                         aeb.NodeName = "Right";
                         aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
                         aeb.Start = true;
                         m_EventBroker->Publish(aeb);
-                    } else if (val < 0) {
+                    } else if (val < 0) { //LeftStrafe
                         Events::AutoAnimationBlend aeb;
                         aeb.Duration = 0.1;
                         aeb.NodeName = "Left";
                         aeb.RootNode = playerModel;
+                        aeb.SingleLevelBlend = true;
                         aeb.Start = true;
                         m_EventBroker->Publish(aeb);
-                    } else {
-                        
-
+                    }
+                }
             }
         }
     }
 
-        }
-        if (glm::length2(m_Movement) > 0) {
-            m_Movement = glm::normalize(m_Movement);
-        } else {
+    //Animation
+    if (glm::length2(m_Movement) < 0.25f) {
+        //Blend to Idle
         if (m_PlayerEntity.Valid()) {
             EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
-
             if (playerModel.Valid()) {
                 Events::AutoAnimationBlend aeb;
                 aeb.Duration = 0.1;
                 aeb.NodeName = "Idle";
                 aeb.RootNode = playerModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+            EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
+            if (firstPersonModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "Idle";
+                aeb.RootNode = firstPersonModel;
+                aeb.Start = true;
+                m_EventBroker->Publish(aeb);
+            }
+        }
+    } else {
+        //Blend to movement
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                Events::AutoAnimationBlend aeb;
+                aeb.Duration = 0.1;
+                aeb.NodeName = "DirectionBlend";
+                aeb.RootNode = playerModel;
                 m_EventBroker->Publish(aeb);
             }
         }
     }
+
+
+    if (glm::length2(m_Movement) > 0) {
+        m_Movement = glm::normalize(m_Movement);
+
+        //Animation
+        // movement direction blend
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                glm::vec2 direction = glm::normalize(glm::vec2(m_Movement.x, m_Movement.z));
+                double weight = glm::abs(glm::dot(glm::vec2(1, 0), direction));
+                Events::SetBlendWeight sbw;
+                sbw.NodeName = "DirectionBlend";
+                sbw.Weight = weight;
+                sbw.RootNode = playerModel;
+                m_EventBroker->Publish(sbw);
             }
+        }
+    }
+
+        
 
     if (e.Command == "Forward" || e.Command == "Right") {
         if (e.Value != 0) {
@@ -235,6 +302,8 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
     if (e.Command == "Crouch") {
         m_Crouching = e.Value > 0;
 
+
+        //Animation
         if (m_PlayerEntity.Valid()) {
             EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
             if (playerModel.Valid()) {
@@ -288,17 +357,10 @@ bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMou
 template <typename EventContext>
 void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool isJumping, double assaultDashCoolDownMaxTimer, double& assaultDashCoolDownTimer, EntityID playerID) {
     m_AssaultDashDoubleTapDeltaTime += dt;
-    m_DashEffectResetTimer += dt;
     assaultDashCoolDownTimer -= dt;
     //cooldown = assaultDashCoolDownMaxTimer sec, pretend the dash lasts 0.25 sec (for friction to do its work)
     if (assaultDashCoolDownTimer > (assaultDashCoolDownMaxTimer - 0.25f)) {
         m_PlayerIsDashing = true;
-        if (m_DashEffectResetTimer > 0.05) {
-            Events::DashAbility e;
-            e.Player = playerID;
-            m_EventBroker->Publish(e);
-            m_DashEffectResetTimer = 0.0;
-        }
     } else {
         m_PlayerIsDashing = false;
     }
@@ -310,6 +372,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
         assaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
         m_AssaultDashDoubleTapped = true;
         m_AssaultDashDoubleTapDeltaTime = 0.f;
+
         Events::DashAbility e;
         e.Player = playerID;
         m_EventBroker->Publish(e);

include/Engine/Input/InputProxy.h

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

include/Engine/Network/Client.h

@@ -17,6 +17,7 @@
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
 #include "Core/EPlayerDeath.h"
@@ -29,19 +30,8 @@
 #include "Core/EAmmoPickup.h"
 #include "Network/ESearchForServers.h"
 #include "../Game/Events/EDashAbility.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
-
+#include "Network/EDisplayServerlist.h"
+#include "Network/EConnectRequest.h"
 class Client : public Network
 {
 public:
@@ -119,6 +109,8 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
+    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -139,6 +131,8 @@ private:
     bool OnDoubleJump(Events::DoubleJump & e);
     EventRelay<Client, Events::DashAbility> m_EDashAbility;
     bool OnDashAbility(const Events::DashAbility& e);
+    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
+    bool OnConnectRequest(const Events::ConnectRequest& e);
 
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;

include/Engine/Network/EConnectRequest.h

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

include/Engine/Network/EDisplayServerlist.h

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

include/Engine/Network/NetworkClient.h

@@ -11,7 +11,7 @@ class NetworkClient
 public:
     NetworkClient();
     virtual ~NetworkClient();
-    virtual void Connect(std::string playerName, std::string address, int port) = 0;
+    virtual bool Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;

include/Engine/Network/Server.h

@@ -60,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;

include/Engine/Network/TCPClient.h

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

include/Engine/Network/UDPClient.h

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

include/Engine/Rendering/AnimationSystem.h

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

include/Engine/Rendering/AutoBlendQueue.h

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

include/Engine/Rendering/BlendTree.h

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

include/Engine/Rendering/BlurHUD.h

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

include/Engine/Rendering/CubeMapPass.h

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

include/Engine/Rendering/DrawBloomPass.h

@@ -13,7 +13,7 @@ class DrawBloomPass
 {
 public:
     DrawBloomPass(IRenderer* renderer, ConfigFile* config);
-    ~DrawBloomPass() { }
+	~DrawBloomPass();
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();

include/Engine/Rendering/DrawFinalPass.h

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

include/Engine/Rendering/EAutoAnimationBlend.h

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

include/Engine/Rendering/ESetBlendWeight.h

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

include/Engine/Rendering/ExplosionEffectJob.h

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

include/Engine/Rendering/FrameBuffer.h

@@ -43,6 +43,16 @@ public:
     ~RenderBuffer();
 };
 
+class Texture2DArray : public ResourceType<GL_TEXTURE_2D_ARRAY>
+{
+public:
+	Texture2DArray(GLuint* resourceHandle, GLenum attachment)
+		: ResourceType(resourceHandle, attachment)
+	{ };
+
+	~Texture2DArray();
+};
+
 class FrameBuffer
 {
 public:

include/Engine/Rendering/ModelJob.h

@@ -19,7 +19,7 @@
 
 struct ModelJob : RenderJob
 {
-    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded)
+    ModelJob(Model* model, Camera* camera, glm::mat4 matrix, ::RawModel::MaterialProperties matProp, ComponentWrapper modelComponent, World* world, glm::vec4 fillColor, float fillPercentage, bool isShielded, bool shadow)
         : RenderJob()
     {
         Model = model;
@@ -111,10 +111,11 @@ struct ModelJob : RenderJob
         Color = modelComponent["Color"];
         GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
-        glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
+        glm::vec3 abspos = glm::vec3(matrix[3][0], matrix[3][1], matrix[3][2]);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
         Depth = worldpos.z;
         World = world;
+		Shadow = shadow;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
@@ -162,9 +163,13 @@ struct ModelJob : RenderJob
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
 	bool IsShielded;
+	bool Shadow;
+
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+		Hash = TextureID;
+		Hash += ModelID << 10;
+		Hash += ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

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

include/Engine/Rendering/RenderJob.h

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

include/Engine/Rendering/RenderQueue.h

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

include/Engine/Rendering/Renderer.h

@@ -18,6 +18,7 @@
 #include "DrawColorCorrectionPass.h"
 #include "SSAOPass.h"
 #include "CubeMapPass.h"
+#include "BlurHUD.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -26,6 +27,7 @@
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
+#include "ShadowPass.h"
 
 class Renderer : public IRenderer
 {
@@ -36,6 +38,7 @@ public:
 		: m_EventBroker(eventBroker)
 		, m_Config(config)
     { }
+	~Renderer();
 
     virtual void Initialize() override;
     virtual void Update(double dt) override;
@@ -75,6 +78,8 @@ private:
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
 	SSAOPass* m_SSAOPass;
     CubeMapPass* m_CubeMapPass;
+	ShadowPass* m_ShadowPass;
+    BlurHUD* m_BlurHUDPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

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

include/Engine/Rendering/ShaderProgram.h

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

include/Engine/Rendering/ShadowPass.h

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

include/Engine/Rendering/ShadowPassState.h

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

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -24,14 +25,16 @@ struct SpriteJob : RenderJob
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
 		Matrix = matrix;
         Color = cSprite["Color"];
+        BlurBackground = (bool)cSprite["BlurBackground"];
+
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
         Depth = 0;
@@ -65,6 +68,7 @@ struct SpriteJob : RenderJob
 
     bool Pickable;
 	bool IsIndicator = false;
+    bool BlurBackground = false;
 
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;

include/Engine/Rendering/Texture.h

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

include/Engine/Rendering/TextureSprite.h

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

include/Engine/Rendering/Util/CommonFunctions.h

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

include/Game/Systems/AbilityCooldownHUDSystem.h

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

include/Game/Systems/AmmoPickupSystem.h

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

include/Game/Systems/DamageIndicatorSystem.h

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

include/Game/Systems/MainMenuSystem.h

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

include/Game/Systems/PlayerDeathSystem.h

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

include/Game/Systems/PlayerSpawnSystem.h

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

include/Game/Systems/ServerListSystem.h

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

include/Game/Systems/SpectatorCameraSystem.h

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

include/Game/Systems/StartSystem.h

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

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -32,11 +32,10 @@ public:
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
-        EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+        /* EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
          EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
          if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
              if (m_ActiveWeapons.count(entity) == 0) {
-
                  WeaponInfo& wi = m_ActiveWeapons[entity];
                  wi.Player = entity;
                  wi.WeaponEntity = entity;
@@ -45,7 +44,7 @@ public:
 
                  OnEquip(cWeapon, wi);
              }
-        }
+         }*/
 
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
@@ -61,7 +60,9 @@ protected:
         EntityWrapper Player;
         EntityWrapper WeaponEntity;
         EntityWrapper FirstPersonEntity;
+        EntityWrapper FirstPersonPlayerModel;
         EntityWrapper ThirdPersonEntity;
+        EntityWrapper ThirdPersonPlayerModel;
     };
 
     IRenderer* m_Renderer;
@@ -89,7 +90,7 @@ protected:
 
     // Returns wi.FirstPersonEntity or wi.ThirdPersonEntity depending on
     // if the player is in first person mode or not.
-    EntityWrapper getRelevantWeaponModelEntity(WeaponInfo& wi)
+    EntityWrapper getRelevantWeaponEntity(WeaponInfo& wi)
     {
         if (isPlayerInFirstPerson(wi.Player)) {
             return wi.FirstPersonEntity;
@@ -137,7 +138,7 @@ protected:
 
     void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
     {
-        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        EntityWrapper root = weaponModelEntity;
         if (!root.Valid()) {
             return;
         }
@@ -254,9 +255,9 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
-        if (!IsServer) {
-            return;
-        }
+        //if (!IsServer) {
+        //    return;
+        //}
 
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
@@ -287,11 +288,11 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        //if (IsClient) {
+        if (IsClient) {
             if (firstPersonAttachment.Valid()) {
                 firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
             }
-        //}
+        }
         if (thirdPersonAttachment.Valid()) {
             thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
         }
@@ -300,7 +301,9 @@ private:
         wi.Player = player;
         wi.WeaponEntity = player;
         wi.FirstPersonEntity = firstPersonWeapon;
+        wi.FirstPersonPlayerModel = firstPersonWeapon;
         wi.ThirdPersonEntity = thirdPersonWeapon;
+        wi.ThirdPersonPlayerModel = thirdPersonWeapon.FirstParentWithComponent("Model");
         
         OnEquip(cWeapon, wi);
     }

resources/DefaultInput.ini

@@ -28,4 +28,5 @@ P=SwitchToPlayer
 K=TakeDamage,1500
 F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
-F4=SwapToClassPick
+Comma=SwapToClassPick
+Period=SwapToTeamPick

resources/Schema/Components.xsd

@@ -65,4 +65,7 @@
 	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
 	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
 	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
+	<xs:include schemaLocation="Components/NetworkComponent.xsd"/>
+	<xs:include schemaLocation="Components/ServerIdentity.xsd"/>
+	<xs:include schemaLocation="Components/ServerList.xsd"/>
 </xs:schema>

resources/Schema/Components/Animation.xml

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

resources/Schema/Components/ExplosionEffect.xml

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

resources/Schema/Components/ExplosionEffect.xsd

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

resources/Schema/Components/Model.xml

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

resources/Schema/Components/Model.xsd

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

resources/Schema/Components/NetworkComponent.xml

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

resources/Schema/Components/NetworkComponent.xsd

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

resources/Schema/Components/ServerIdentity.xml

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

resources/Schema/Components/ServerIdentity.xsd

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="ServerIdentity">
+		<xs:annotation><xs:documentation>A component for tracking the data of servers in the serverlist.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="IP" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>The IP adress of the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Port" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Port used to connect to the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ServerName" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>Name of the server.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="PlayersConnected" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Amount of players connected to the server.</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ServerList.xml

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

resources/Schema/Components/ServerList.xsd

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="ServerList">
+		<xs:annotation><xs:documentation>The menulist where servers will be listed.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>The amount of server identities in this list.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NextPosition" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Where the next serverIdentity should be placed.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Offset" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ShieldAbility.xml

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

resources/Schema/Components/ShieldAbility.xsd

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

resources/Schema/Components/Sprite.xml

@@ -5,4 +5,5 @@
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>
 	<DepthSort>true</DepthSort>
+	<BlurBackground>false</BlurBackground>
 </Sprite>

resources/Schema/Components/Sprite.xsd

@@ -24,6 +24,9 @@
 				<xs:element name="DepthSort" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the sprite should be sorted with depth or not. Only use false for textures that are on HUD</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="BlurBackground" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>Wether the background should be blurred begind this sprite.</xs:documentation></xs:annotation>
+				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Entities/AmmoHUD

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

resources/Schema/Entities/AmmoPickup.xml

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

resources/Schema/Entities/BlendTreeAssaultWeapon.xml

@@ -1,46 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="PrimaryBlendTree" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
+  <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="FinalBlend">
       <Components>
         <c:Blend>
-      <Pose1>Idle</Pose1>
-      <Pose2>WeaponAction</Pose2>
+          <Pose1>BlendTreeAssaultWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
           <Weight>0</Weight>
           <SubTreeRoot>true</SubTreeRoot>
         </c:Blend>
         <c:Transform/>
       </Components>
-
       <Children>
-    <Entity name="WeaponAction">
+        <Entity name="BlendTreeAssaultWeapon">
           <Components>
             <c:Blend>
               <Pose1>Fire</Pose1>
               <Pose2>Reload</Pose2>
-          <Weight>1</Weight>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
             </c:Blend>
             <c:Transform/>
           </Components>
           <Children>
-        <Entity name="Fire">
+            <Entity name="Reload">
               <Components>
                 <c:Animation>
-              <AnimationName>ShootShotgunF</AnimationName>
-              <Speed>1</Speed>
-              <Play>true</Play>
+                  <AnimationName>ReloadSwitchF</AnimationName>
+                  <Speed>0.5</Speed>
                   <Loop>false</Loop>
                 </c:Animation>
                 <c:Transform/>
               </Components>
               <Children/>
             </Entity>
-        <Entity name="Reload">
+            <Entity name="Fire">
               <Components>
                 <c:Animation>
-              <AnimationName>ReloadSwitchF</AnimationName>
-              <Time>0.58991607886241582</Time>
+                  <AnimationName>ShootRifleF</AnimationName>
                   <Speed>1</Speed>
-              <Play>true</Play>
+                  <Loop>false</Loop>
                 </c:Animation>
                 <c:Transform/>
               </Components>
@@ -48,18 +59,162 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="Idle">
           <Components>
             <c:Animation>
               <AnimationName>IdleF</AnimationName>
-          <Time>0.14837891922093149</Time>
               <Speed>1</Speed>
               <Play>true</Play>
+              <Additive>true</Additive>
             </c:Animation>
             <c:Transform/>
           </Components>
           <Children/>
         </Entity>
       </Children>
+    </Entity>
+    <Entity name="ViewModel">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:Model>
+          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.120748274" Y="-0.228437141" Z="-0.181454718"/>
+          <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="WeaponMuzzle">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+              <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ReloadSpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultReloadEffectView.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="AmmoHUD">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Ammo_Joint</BoneName>
+          <ScaleOffset X="0.5" Y="0.5" Z="1"/>
+          <InheritScale>true</InheritScale>
+        </c:BoneAttachment>
+        <c:Transform>
+          <Position X="0.0540266186" Y="-0.0954354703" Z="-0.255526125"/>
+          <Orientation X="0.000684258412" Y="0.077423811" Z="0.00118651299"/>
+          <Scale X="0.50000006" Y="0.500000477" Z="1.00000083"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Background">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.00200000009"/>
+              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Text">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MagazineAmmo">
+              <Components>
+                <c:Text>
+                  <Content>32</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Ammo">
+              <Components>
+                <c:Text>
+                  <Content>320</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>PlayerAssault</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>Ammo</Field>
+                </c:TextFieldReader>
+                <c:Transform>
+                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
+                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/BlendTreeDefenderWeapon.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Hands" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>MovementBlend</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>BlendTreeDefenderWeapon</Pose1>
+          <Pose2>BlendTreeSecondaryWeapon</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="BlendTreeDefenderWeapon">
+          <Components>
+            <c:Blend>
+              <Pose1>ActionBlend</Pose1>
+              <Pose2>Shield</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Shield">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ActivateDeactiveShieldF</AnimationName>
+                  <Time>1</Time>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ActionBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>Idle</Pose1>
+                  <Pose2>ActionBlend2</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ActionBlend2">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Fire</Pose1>
+                      <Pose2>Reload</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Fire">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootShotgunF</AnimationName>
+                          <Time>0.5</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Reload">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShotgunReloadTwoF</AnimationName>
+                          <Time>0.23333333432674408</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeSecondaryWeapon">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="MovementBlend">
+      <Components>
+        <c:Blend>
+          <Pose1>Idle</Pose1>
+          <Pose2>Run</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Run">
+          <Components>
+            <c:Animation>
+              <AnimationName>RunF</AnimationName>
+              <Time>0.93061516164344571</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Idle">
+          <Components>
+            <c:Animation>
+              <AnimationName>IdleF</AnimationName>
+              <Time>0.11396167157691739</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlueRifle

@@ -1,19 +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:BoneAttachment>
-      <BoneName>R_Arm_Weapon_Joint</BoneName>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.136586398" Y="0.92942369" Z="-0.139760047"/>
-      <Orientation X="-0.601206124" Y="0.132410824" Z="-0.129014626"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/BoneMarker

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="R_Leg_Top" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BoneAttachment>
-      <BoneName>R_Leg_Top</BoneName>
-      <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:BoneAttachment>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-      <Color A="1" B="1" G="19.6078434" R="1"/>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.0664939061" Y="0.714353919" Z="0.0475388765"/>
-      <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
-      <Orientation X="-0.783109188" Y="-0.0050998251" Z="3.14151597"/>
-    </c:Transform>
-  </Components>
-
-  <Children/>
-
-</Entity>

resources/Schema/Entities/CapturePoint.xml

@@ -4,14 +4,39 @@
   <Components>
     <c:AABB/>
     <c:CapturePoint/>
-    <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
-    </c:Model>
     <c:Team/>
-    <c:Transform/>
     <c:Trigger/>
+    <c:Transform/>
   </Components>
 
+  <Children>
+    <Entity name="Red">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
       <Children/>
+    </Entity>
+    <Entity name="Blue">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spectator">
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/CapturePointHUDGroup.xml

@@ -13,38 +13,8 @@
       <Components>
         <c:Sprite>
           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.300000012" B="1" G="1" R="1"/>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0.919596612" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="ProgressionHexagon">
-          <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>2</CapturePointNumber>
-            </c:CapturePointHUD>
-            <c:Fill>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-              <Orientation X="0" Y="0" Z="1.57079637"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="BackgroundHexagon">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
           <Color A="0.300000012" B="1" G="1" R="1"/>
         </c:Sprite>
         <c:Transform>
@@ -54,20 +24,21 @@
       <Children>
         <Entity name="ProgressionHexagon">
           <Components>
+            <c:Fill>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
             <c:CapturePointHUD>
               <CapturePointNumber>3</CapturePointNumber>
             </c:CapturePointHUD>
-            <c:Fill>
-              <Percentage>0.80222018197612788</Percentage>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Fill>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
             </c:Sprite>
             <c:Transform>
               <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
               <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -78,6 +49,8 @@
       <Components>
         <c:Sprite>
           <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>
@@ -87,19 +60,21 @@
       <Children>
         <Entity name="ProgressionHexagon">
           <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>4</CapturePointNumber>
-            </c:CapturePointHUD>
             <c:Fill>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>4</CapturePointNumber>
+            </c:CapturePointHUD>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
             </c:Sprite>
             <c:Transform>
               <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
               <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -110,6 +85,44 @@
       <Components>
         <c:Sprite>
           <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>
+          <Position X="0" Y="0.919596612" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ProgressionHexagon">
+          <Components>
+            <c:Fill>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>2</CapturePointNumber>
+            </c:CapturePointHUD>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0" Z="0.00999999978"/>
+              <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="BackgroundHexagon">
+      <Components>
+        <c:Sprite>
+          <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>
@@ -119,19 +132,21 @@
       <Children>
         <Entity name="ProgressionHexagon">
           <Components>
-            <c:CapturePointHUD>
-              <CapturePointNumber>1</CapturePointNumber>
-            </c:CapturePointHUD>
             <c:Fill>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Fill>
+            <c:CapturePointHUD>
+              <CapturePointNumber>1</CapturePointNumber>
+            </c:CapturePointHUD>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
             </c:Sprite>
             <c:Transform>
               <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
               <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -142,7 +157,9 @@
       <Components>
         <c:Sprite>
           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-          <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
+          <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
+          <Color A="0.699999988" B="0" G="0" R="1"/>
         </c:Sprite>
         <c:Transform>
           <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -151,17 +168,19 @@
       <Children>
         <Entity name="ProgressionHexagon">
           <Components>
-            <c:CapturePointHUD/>
             <c:Fill>
               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
             </c:Fill>
+            <c:CapturePointHUD/>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
             </c:Sprite>
             <c:Transform>
               <Position X="0" Y="0" Z="0.00999999978"/>
-              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
               <Orientation X="0" Y="0" Z="1.57079637"/>
+              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
             </c:Transform>
           </Components>
           <Children/>

resources/Schema/Entities/DashEffect.xml

@@ -2,17 +2,12 @@
 <Entity name="DashEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Animation/>
     <c:Lifetime>
       <Lifetime>0.5</Lifetime>
     </c:Lifetime>
-    <c:ExplosionEffect>
-      <Velocity X="0" Y="0" Z="0"/>
-      <TimeSinceDeath>0</TimeSinceDeath>
-      <ExplosionDuration>0.5</ExplosionDuration>
-      <EndColor A="0" B="0" G="0" R="0"/>
-    </c:ExplosionEffect>
-    <c:Model/>
     <c:Transform/>
   </Components>
+
+  <Children/>
+
 </Entity>

resources/Schema/Entities/DeadGirl.xlm

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

resources/Schema/Entities/FirstPersonArms

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Wave" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Animation>
-      <AnimationName1>Run</AnimationName1>
-      <Weight1>0.5</Weight1>
-      <Time1>0.97312056690160276</Time1>
-      <Speed1>1</Speed1>
-      <Speed2>1</Speed2>
-      <AnimationName2>ReloadSwitch</AnimationName2>
-      <Time2>0.91310356788604263</Time2>
-      <AnimationName3>LeftRight</AnimationName3>
-      <Weight3>0</Weight3>
-      <Time3>0.040207288496060478</Time3>
-      <Speed3>1</Speed3>
-    </c:Animation>
-    <c:AnimationOffset>
-      <AnimationName>DownUp</AnimationName>
-      <Time>0.77999961376190186</Time>
-    </c:AnimationOffset>
-    <c:Model>
-      <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-      <Color A="0.627451003" B="19.6078434" G="1" R="3.92156863"/>
-      <Transparent>true</Transparent>
-    </c:Model>
-    <c:Transform>
-      <Position X="-0.690088332" Y="1.00491476" Z="0"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeapon.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0.120778561" Y="-0.223796993" Z="-0.15143311"/>
-          <Orientation X="0.0957378224" Y="0.0132024018" Z="0.0284451656"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Camera/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/FloatingBridgePillar.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>Models/Props/Bridges/SciFi_Bridge_Support_Top_Red.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0" Y="-6.44986534" Z="-6.68222857"/>
+      <Scale X="1.10000002" Y="1.10000002" Z="1.10000002"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Props/Bridges/SciFi_Bridge_Support_Bot_Red.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0.215699792" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:FloatingEffect>
+          <Period>12</Period>
+          <Time>513.93462028501312</Time>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-0.0882625133" Z="-0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Collidable/>
+            <c:Model>
+              <Resource>Models/Props/Bridges/SciFi_Bridge_Support_Middle_Red.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="0.121641584" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthPickup.xml

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

resources/Schema/Entities/MainMenu.xml

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="MainMenuOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Menu/>
+    <c:Transform>
+      <Position X="0" Y="0" Z="-0.5"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Side_Origin">
+      <Components>
+        <c:Transform>
+          <Position X="-0.443000019" Y="0.0400000028" Z="0"/>
+          <Orientation X="0" Y="0.867000043" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ButtonPos_1">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Button_1">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:InputCmdButton>
+                  <Command>Play</Command>
+                  <PressValue>1</PressValue>
+                </c:InputCmdButton>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Play</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ButtonPos_3">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="-0.140000001" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Button_3">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Credits</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ButtonPos_2">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="-0.0700000003" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Button_2">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Option</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000076" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ButtonPos_4">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="-0.209999993" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Button_4">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Quit</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Popup_Origin">
+      <Components>
+        <c:Transform>
+          <Position X="-0.103822395" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PlaySpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/ServerList.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ModelCollisionTest.xml

@@ -2,64 +2,168 @@
 <Entity 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" Z="-0.313012958"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
+  <Children>
+    <Entity name="RedSpawn">
+      <Components>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/PlayerAssaultFallbackRed.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.300000012" Y="0.0270000007" Z="0"/>
+        </c:Transform>
+      </Components>
       <Children>
         <Entity>
           <Components>
-        <c:Camera/>
-        <c:Listener/>
+            <c:SpawnPoint/>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
+              <Color A="1" B="0" G="0" R="1"/>
+            </c:Model>
             <c:Transform>
-          <Position X="2.56531811" Y="0.637967348" Z="0.202344239"/>
-          <Orientation X="2.68780756" Y="1.36143553" Z="3.14159179"/>
+              <Position X="0.800000012" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
         <Entity>
           <Components>
-        <c:Collidable/>
+            <c:SpawnPoint/>
             <c:Model>
-          <Resource>../assets/Models/Core/Tri.obj</Resource>
-          <Color A="1" B="1" G="0.392156869" R="0"/>
+              <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
+              <Color A="1" B="0.0117647061" G="0" R="1"/>
             </c:Model>
             <c:Transform>
-          <Scale X="2" Y="2" Z="0.200000003"/>
-          <Orientation X="2.70100021" Y="2.37000012" Z="0.266000003"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:Model>
-              <Resource>../assets/Models/Core/Tri.obj</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
-            </c:Model>
-            <c:Transform>
-              <Orientation X="0" Y="3.14159274" Z="4.71238899"/>
+              <Position X="-0.600000024" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
       </Children>
     </Entity>
-    <Entity>
+    <Entity name="DirectionalLight">
       <Components>
-        <c:AABB/>
-        <c:Collidable/>
+        <c:SceneLight>
+          <Gamma>0.5</Gamma>
+          <Exposure>4</Exposure>
+        </c:SceneLight>
+        <c:DirectionalLight/>
         <c:Model>
-          <Resource>../assets/Models/Core/UnitCube.obj</Resource>
+          <Resource>sModels/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
         </c:Model>
-        <c:Physics/>
         <c:Transform>
-          <Position X="-1.95333278" Y="0.296304941" Z="2.56487775"/>
+          <Position X="-6.00145912" Y="1.42697716" Z="3.04144025"/>
+          <Orientation X="5.69400024" Y="841.179565" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
+    <Entity name="ObstacleCourse">
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>Models/Test/ObstacleCourse.mesh</Resource>
+        </c:Model>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BlueSpawn">
+      <Components>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.300000012" Y="0.0270000007" Z="6.67400026"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+              <Color A="1" B="1" G="0.254901975" R="0"/>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0.600000024" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+              <Color A="1" B="1" G="0.254901975" R="0"/>
+            </c:Model>
+            <c:Transform>
+              <Position X="0.800000012" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Arms">
+      <Components>
+        <c:Blend>
+          <Pose1>ActivateDeactive</Pose1>
+          <Pose2></Pose2>
+        </c:Blend>
+        <c:Model>
+          <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="1.30585015" Z="2.01450038"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ActivateDeactive">
+          <Components>
+            <c:Animation>
+              <AnimationName>ActivateDeactiveShieldF</AnimationName>
+              <Time>0.68323420867830964</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Weapon">
+          <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
+            <c:Model>
+              <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0.0621522591" Y="-0.169021279" Z="-0.219918266"/>
+              <Orientation X="-0.709758997" Y="1.22785306" Z="-0.154755235"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/MovementTest.xml

@@ -2,7 +2,9 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="0" Y="-0.872543275" Z="-2.49763942"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -52,7 +54,10 @@
     </Entity>
     <Entity name="DirectionalLight">
       <Components>
-        <c:SceneLight/>
+        <c:SceneLight>
+          <Gamma>0.49999982118606567</Gamma>
+          <Exposure>2.5599997043609619</Exposure>
+        </c:SceneLight>
         <c:DirectionalLight/>
         <c:Model>
           <Resource>sModels/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
@@ -118,6 +123,48 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="Arms">
+      <Components>
+        <c:Blend>
+          <Pose1>ActivateDeactive</Pose1>
+          <Pose2></Pose2>
+        </c:Blend>
+        <c:Model>
+          <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="1.30585015" Z="2.01450038"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ActivateDeactive">
+          <Components>
+            <c:Animation>
+              <AnimationName>ActivateDeactiveShieldF</AnimationName>
+              <Time>0.44649605185380015</Time>
+              <Play>true</Play>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Weapon">
+          <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
+            <c:Model>
+              <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0.00681143999" Y="-0.204994932" Z="-0.209244296"/>
+              <Orientation X="-0.581807375" Y="0.562133908" Z="-0.0719003305"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/OverwatchCamera.xml

@@ -8,6 +8,7 @@
     </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="-4" Z="0"/>
+      <Orientation X="0" Y="55.3495064" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -20,6 +21,369 @@
         </c:Transform>
       </Components>
       <Children>
+        <Entity name="PickClassCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickClassHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="-0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="DefenderClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Defender-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="DefenderText">
+                      <Components>
+                        <c:Text>
+                          <Content>Defender</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="SniperClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Sniper-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="SniperText">
+                      <Components>
+                        <c:Text>
+                          <Content>Sniper</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="AssaultClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Icons/Classes/Assault-01.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickClass</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="AssaultText">
+                      <Components>
+                        <c:Text>
+                          <Content>Assault</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Color A="1" B="0" G="1" R="0.784313738"/>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0.800000012" Z="0"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ClassPickText">
+                  <Components>
+                    <c:Text>
+                      <Content>Pick Class</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.0799999982" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ToTeamPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>SwapToTeamPick</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.180000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="TeamText">
+                      <Components>
+                        <c:Text>
+                          <Content>Team</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="PickTeamCamera">
+          <Components>
+            <c:Camera/>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="PickTeamHUD">
+              <Components>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="-0.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="TeamPickText">
+                  <Components>
+                    <c:Text>
+                      <Content>Pick Team</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.0799999982" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="SpectatorPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="SpectatorText">
+                      <Components>
+                        <c:Text>
+                          <Content>Spectator</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0450000018" Z="0.00200000009"/>
+                          <Scale X="0.200000003" Y="0.200000003" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="TeamRedPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="0.294117659" R="0.980392158"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>2</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="RedText">
+                      <Components>
+                        <c:Text>
+                          <Content>Red</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0850000009" Z="0.00249999994"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="TeamBluePick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0.980392158" G="0.294117659" R="0"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>PickTeam</Command>
+                      <PressValue>3</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="-0.150000006" Y="-0.0500000007" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="BlueText">
+                      <Components>
+                        <c:Text>
+                          <Content>Blue</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0850000009" Z="0.00200000009"/>
+                          <Scale X="0.310000002" Y="0.310000002" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ToClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                      <Visible>false</Visible>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>SwapToClassPick</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.0800000057" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ClassText">
+                      <Components>
+                        <c:Text>
+                          <Content>Class</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
         <Entity name="SpectatorCamera">
           <Components>
             <c:Camera/>
@@ -33,6 +397,20 @@
                 </c:Transform>
               </Components>
               <Children>
+                <Entity name="RespawnTimer">
+                  <Components>
+                    <c:Text>
+                      <Content>7</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="1" B="0" G="1" R="0.784313738"/>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="0" Y="0.178199276" Z="0"/>
+                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
                 <Entity name="CapturePointHUD">
                   <Components>
                     <c:Transform>
@@ -46,40 +424,7 @@
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                           <GlowMap></GlowMap>
-                          <Color A="0.300000012" B="1" G="1" R="1"/>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.919596612" Z="0"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="ProgressionHexagon">
-                          <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>2</CapturePointNumber>
-                            </c:CapturePointHUD>
-                            <c:Fill>
-                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0" Y="0" Z="0.00999999978"/>
-                              <Orientation X="0" Y="0" Z="1.57079637"/>
-                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="BackgroundHexagon">
-                      <Components>
-                        <c:Sprite>
-                          <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>
@@ -89,15 +434,16 @@
                       <Children>
                         <Entity name="ProgressionHexagon">
                           <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>3</CapturePointNumber>
-                            </c:CapturePointHUD>
                             <c:Fill>
                               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                             </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>3</CapturePointNumber>
+                            </c:CapturePointHUD>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -114,6 +460,7 @@
                         <c:Sprite>
                           <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>
@@ -123,15 +470,16 @@
                       <Children>
                         <Entity name="ProgressionHexagon">
                           <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>4</CapturePointNumber>
-                            </c:CapturePointHUD>
                             <c:Fill>
                               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                             </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>4</CapturePointNumber>
+                            </c:CapturePointHUD>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -148,6 +496,43 @@
                         <c:Sprite>
                           <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>
+                          <Position X="0" Y="0.919596612" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="ProgressionHexagon">
+                          <Components>
+                            <c:Fill>
+                              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                            </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>2</CapturePointNumber>
+                            </c:CapturePointHUD>
+                            <c:Sprite>
+                              <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                              <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="0" Z="0.00999999978"/>
+                              <Orientation X="0" Y="0" Z="1.57079637"/>
+                              <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="BackgroundHexagon">
+                      <Components>
+                        <c:Sprite>
+                          <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>
@@ -157,16 +542,17 @@
                       <Children>
                         <Entity name="ProgressionHexagon">
                           <Components>
-                            <c:CapturePointHUD>
-                              <CapturePointNumber>1</CapturePointNumber>
-                            </c:CapturePointHUD>
                             <c:Fill>
                               <Percentage>0.10332605343919568</Percentage>
                               <Color A="0.699999988" B="0" G="0" R="1"/>
                             </c:Fill>
+                            <c:CapturePointHUD>
+                              <CapturePointNumber>1</CapturePointNumber>
+                            </c:CapturePointHUD>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -183,6 +569,7 @@
                         <c:Sprite>
                           <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>
@@ -192,13 +579,14 @@
                       <Children>
                         <Entity name="ProgressionHexagon">
                           <Components>
-                            <c:CapturePointHUD/>
                             <c:Fill>
                               <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                             </c:Fill>
+                            <c:CapturePointHUD/>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                             </c:Sprite>
                             <c:Transform>
                               <Position X="0" Y="0" Z="0.00999999978"/>
@@ -212,93 +600,102 @@
                     </Entity>
                   </Children>
                 </Entity>
-                <Entity name="RespawnTimer">
-                  <Components>
-                    <c:Text>
-                      <Content>16</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="1" B="0" G="1" R="0.784313738"/>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="0.178199276" Z="0"/>
-                      <Scale X="0.0250000004" Y="0.0250000004" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="PickClassCamera">
-          <Components>
-            <c:Camera/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PickClassHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.5"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="DefenderClassPick">
+                <Entity name="ToTeamPick">
                   <Components>
                     <c:Button/>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
                       <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
                     </c:Sprite>
                     <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>2</PressValue>
-                    </c:InputCmdButton>
-                    <c:Transform>
-                      <Position X="0.349999994" Y="0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="AssaultClassPick">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitRaptor.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
+                      <Command>SwapToTeamPick</Command>
                       <PressValue>1</PressValue>
                     </c:InputCmdButton>
                     <c:Transform>
-                      <Position X="0.349999994" Y="0.149504215" Z="0"/>
+                      <Position X="0.349999994" Y="-0.180000007" Z="0"/>
                       <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
                     </c:Transform>
                   </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
                       <Children/>
                     </Entity>
-                <Entity name="SniperClassPick">
+                    <Entity name="TeamText">
                       <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                    </c:Sprite>
-                    <c:InputCmdButton>
-                      <Command>PickClass</Command>
-                      <PressValue>3</PressValue>
-                    </c:InputCmdButton>
+                        <c:Text>
+                          <Content>Team</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
                         <c:Transform>
-                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
-                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
                         </c:Transform>
                       </Components>
                       <Children/>
                     </Entity>
                   </Children>
                 </Entity>
+                <Entity name="ToClassPick">
+                  <Components>
+                    <c:Button/>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="1" B="0" G="1" R="0.509803951"/>
+                    </c:Sprite>
+                    <c:InputCmdButton>
+                      <Command>SwapToClassPick</Command>
+                      <PressValue>1</PressValue>
+                    </c:InputCmdButton>
+                    <c:Transform>
+                      <Position X="0.349999994" Y="-0.0800000057" Z="0"/>
+                      <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="ChangeText">
+                      <Components>
+                        <c:Text>
+                          <Content>Change</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="0" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ClassText">
+                      <Components>
+                        <c:Text>
+                          <Content>Class</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.224999994" Z="0.00200000009"/>
+                          <Scale X="0.25" Y="0.25" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
           </Children>
         </Entity>
       </Children>

resources/Schema/Entities/PlayerAssaultBlue.xml

@@ -6,9 +6,7 @@
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
-    <c:AssaultWeapon>
-      <FireCooldown>0.5</FireCooldown>
-    </c:AssaultWeapon>
+    <c:AssaultWeapon/>
     <c:Team>
       <Team>
         <Blue/>
@@ -16,8 +14,14 @@
     </c:Team>
     <c:Collidable/>
     <c:DashAbility/>
+    <c:DefenderWeapon>
+      <Slot>
+        <Secondary/>
+      </Slot>
+    </c:DefenderWeapon>
     <c:DoubleJump/>
     <c:Health/>
+    <c:NetworkComponent/>
     <c:Physics>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
@@ -459,7 +463,7 @@
                       <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
                     </c:Fill>
                     <c:Sprite>
-                      <DiffuseTexture>Textures/Icons/Abilities/Superman-01.png</DiffuseTexture>
+                      <DiffuseTexture>Textures\Icons\Abilities\Superman-01.png</DiffuseTexture>
                       <GlowMap></GlowMap>
                       <DepthSort>false</DepthSort>
                       <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
@@ -493,251 +497,35 @@
             </Entity>
           </Children>
         </Entity>
-        <Entity name="Hands">
+        <Entity name="Weapons">
           <Components>
-            <c:BlendAdditive>
-              <Adder>MovementBlend</Adder>
-              <Receiver>FinalBlend</Receiver>
-            </c:BlendAdditive>
-            <c:Model>
-              <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
-            </c:Model>
             <c:Transform/>
           </Components>
           <Children>
             <Entity name="PrimaryAttachment">
               <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
                 <c:Spawner>
                   <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
                 </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120748274" Y="-0.228437141" Z="-0.181454718"/>
-                  <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="AssaultWeapon">
-                  <Components>
-                    <c:Model>
-                      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                    </c:Model>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="ReloadEffect">
-                      <Components>
                 <c:Transform/>
+                <c:WeaponAttachment>
+                  <Weapon>AssaultWeapon</Weapon>
+                </c:WeaponAttachment>
               </Components>
               <Children/>
             </Entity>
-                    <Entity name="WeaponMuzzle">
-                      <Components>
-                        <c:Spawner>
-                          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                        </c:Spawner>
-                        <c:Transform>
-                          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
-                          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="FirstPersonReloadSpawner">
-                      <Components>
-                        <c:Spawner>
-                          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-                        </c:Spawner>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="AmmunitionHUD">
-                      <Components>
-                        <c:Transform>
-                          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
-                          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="AmmunitionHUDBackground">
-                          <Components>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <Color A="0.588235319" B="0" G="0" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0" Y="0" Z="-0.00200000009"/>
-                              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="AmmunitionText">
-                          <Components>
-                            <c:Transform/>
-                          </Components>
-                          <Children>
-                            <Entity name="MagazineAmmo">
-                              <Components>
-                                <c:Text>
-                                  <Content>32</Content>
-                                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                                </c:Text>
-                                <c:TextFieldReader>
-                                  <ParentEntityName>PlayerAssault</ParentEntityName>
-                                  <ComponentType>AssaultWeapon</ComponentType>
-                                  <Field>MagazineAmmo</Field>
-                                </c:TextFieldReader>
-                                <c:Transform>
-                                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="Ammo">
-                              <Components>
-                                <c:Text>
-                                  <Content>320</Content>
-                                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                                </c:Text>
-                                <c:TextFieldReader>
-                                  <ParentEntityName>PlayerAssault</ParentEntityName>
-                                  <ComponentType>AssaultWeapon</ComponentType>
-                                  <Field>Ammo</Field>
-                                </c:TextFieldReader>
-                                <c:Transform>
-                                  <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-                                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
             <Entity name="SecondaryAttachment">
               <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/WeaponDefenderBlueView.xml</EntityFile>
                 </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120748274" Y="-0.228437141" Z="-0.181454718"/>
-                  <Orientation X="0.0104048206" Y="-0.00268219248" Z="0.0428443849"/>
-                </c:Transform>
+                <c:Transform/>
+                <c:WeaponAttachment>
+                  <Weapon>DefenderWeapon</Weapon>
+                </c:WeaponAttachment>
               </Components>
               <Children/>
             </Entity>
-            <Entity name="FinalBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>BlendTreeAssaultWeapon</Pose1>
-                  <Pose2>BlendTreeSecondaryWeapon</Pose2>
-                  <Weight>0</Weight>
-                  <SubTreeRoot>true</SubTreeRoot>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="BlendTreeAssaultWeapon">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>Fire</Pose1>
-                      <Pose2>Reload</Pose2>
-                      <Weight>0</Weight>
-                      <SubTreeRoot>true</SubTreeRoot>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="Fire">
-                      <Components>
-                        <c:Animation>
-                          <AnimationName>ShootRifleF</AnimationName>
-                          <Speed>1</Speed>
-                          <Loop>false</Loop>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="Reload">
-                      <Components>
-                        <c:Animation>
-                          <AnimationName>ReloadSwitchF</AnimationName>
-                          <Speed>1</Speed>
-                          <Loop>false</Loop>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BlendTreeSecondaryWeapon">
-                  <Components>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="MovementBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>Idle</Pose1>
-                  <Pose2>Run</Pose2>
-                  <Weight>0</Weight>
-                  <SubTreeRoot>true</SubTreeRoot>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="Run">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>RunF</AnimationName>
-                      <Speed>1</Speed>
-                      <Play>true</Play>
-                      <Additive>true</Additive>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="Idle">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>IdleF</AnimationName>
-                      <Speed>1</Speed>
-                      <Play>true</Play>
-                      <Additive>true</Additive>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
           </Children>
         </Entity>
       </Children>
@@ -761,16 +549,14 @@
     </Entity>
     <Entity name="PlayerModel">
       <Components>
-        <c:BlendAdditive>
-          <Adder>BlendTreeAim</Adder>
-          <Receiver>BlendTreeAssault</Receiver>
-        </c:BlendAdditive>
+        <c:BlendOverride>
+          <Master>BlendTreeUpper</Master>
+          <Slave>BlendTreeLower</Slave>
+        </c:BlendOverride>
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-          <Color A="1" B="1" G="1" R="1"/>
-          <Visible>true</Visible>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -780,19 +566,19 @@
             <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.17052114" Y="1.03320956" Z="-0.224843055"/>
+              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
+            </c:Transform>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
               <Person>
                 <ThirdPerson/>
               </Person>
             </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.165396646" Y="1.14537966" Z="-0.206537575"/>
-              <Orientation X="0.484640986" Y="-0.00695174001" Z="0.0685098693"/>
-            </c:Transform>
           </Components>
           <Children/>
         </Entity>
@@ -801,72 +587,26 @@
             <c:BoneAttachment>
               <BoneName>R_Arm_Weapon_Joint</BoneName>
             </c:BoneAttachment>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.17052114" Y="1.03320956" Z="-0.224843055"/>
+              <Orientation X="-0.035638921" Y="-0.0872893855" Z="0.133119702"/>
+            </c:Transform>
             <c:WeaponAttachment>
               <Weapon>SidearmWeapon</Weapon>
               <Person>
                 <ThirdPerson/>
               </Person>
             </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.165396646" Y="1.14537966" Z="-0.206537575"/>
-              <Orientation X="0.484640986" Y="-0.00695174001" Z="0.0685098693"/>
-            </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="BlendTreeAim">
+        <Entity name="BlendTreeLower">
           <Components>
             <c:Blend>
-              <Pose1>AimPrimary</Pose1>
-              <Pose2>AimSecondary</Pose2>
-              <Weight>0</Weight>
-              <SubTreeRoot>true</SubTreeRoot>
-            </c:Blend>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="AimSecondary">
-              <Components>
-                <c:Animation>
-                  <AnimationName>AimSecWepA</AnimationName>
-                  <Time>0.71143966913223267</Time>
-                  <Loop>false</Loop>
-                  <Additive>true</Additive>
-                </c:Animation>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="AimPrimary">
-              <Components>
-                <c:Animation>
-                  <AnimationName>AimRifleA</AnimationName>
-                  <Time>0.71143966913223267</Time>
-                  <Loop>false</Loop>
-                  <Additive>true</Additive>
-                </c:Animation>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BlendTreeAssault">
-          <Components>
-            <c:BlendOverride>
-              <Master>ReloadSwitchBlend</Master>
-              <Slave>FinalMovementBlend</Slave>
-            </c:BlendOverride>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="FinalMovementBlend">
-              <Components>
-                <c:Blend>
-                  <Pose1>StandCrouchBlend</Pose1>
+              <Pose1>MovementBlend</Pose1>
               <Pose2>JumpDashBlend</Pose2>
               <Weight>2.5146881298480398e-63</Weight>
               <SubTreeRoot>true</SubTreeRoot>
@@ -874,7 +614,7 @@
             <c:Transform/>
           </Components>
           <Children>
-                <Entity name="StandCrouchBlend">
+            <Entity name="MovementBlend">
               <Components>
                 <c:Blend>
                   <Pose1>StandMovement</Pose1>
@@ -888,14 +628,14 @@
                 <Entity name="CrouchMovement">
                   <Components>
                     <c:Blend>
-                          <Pose1>MovementBlend</Pose1>
+                      <Pose1>DirectionBlend</Pose1>
                       <Pose2>Idle</Pose2>
                       <Weight>1</Weight>
                     </c:Blend>
                     <c:Transform/>
                   </Components>
                   <Children>
-                        <Entity name="MovementBlend">
+                    <Entity name="DirectionBlend">
                       <Components>
                         <c:Blend>
                           <Pose1>Walk</Pose1>
@@ -919,8 +659,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                      <Time>0.93215091236880454</Time>
-                                      <Speed>1</Speed>
+                                  <Time>0.79179726223533642</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -931,8 +670,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeRightF</AnimationName>
-                                      <Time>0.85947237431958712</Time>
-                                      <Speed>1</Speed>
+                                  <Time>0.719118724186119</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -945,8 +683,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>CrouchWalkF</AnimationName>
-                                  <Time>0.63784635949699009</Time>
-                                  <Speed>1</Speed>
+                              <Time>0.49749270936352197</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -959,8 +696,8 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>CrouchF</AnimationName>
-                              <Time>0.99862473341677438</Time>
-                              <Speed>1</Speed>
+                          <Time>1.1707202063102131</Time>
+                          <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
                       </Components>
@@ -971,14 +708,14 @@
                 <Entity name="StandMovement">
                   <Components>
                     <c:Blend>
-                          <Pose1>MovementBlend</Pose1>
+                      <Pose1>DirectionBlend</Pose1>
                       <Pose2>Idle</Pose2>
                       <Weight>1</Weight>
                     </c:Blend>
                     <c:Transform/>
                   </Components>
                   <Children>
-                        <Entity name="MovementBlend">
+                    <Entity name="DirectionBlend">
                       <Components>
                         <c:Blend>
                           <Pose1>RunWalkBlend</Pose1>
@@ -988,42 +725,6 @@
                         <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>StrafeLeftF</AnimationName>
-                                      <Time>0.32459360994030106</Time>
-                                      <Speed>1</Speed>
-                                      <Play>true</Play>
-                                    </c:Animation>
-                                    <c:Transform/>
-                                  </Components>
-                                  <Children/>
-                                </Entity>
-                                <Entity name="Right">
-                                  <Components>
-                                    <c:Animation>
-                                      <AnimationName>StrafeRightF</AnimationName>
-                                      <Time>0.34810913982041569</Time>
-                                      <Speed>1</Speed>
-                                      <Play>true</Play>
-                                    </c:Animation>
-                                    <c:Transform/>
-                                  </Components>
-                                  <Children/>
-                                </Entity>
-                              </Children>
-                            </Entity>
                         <Entity name="RunWalkBlend">
                           <Components>
                             <c:Blend>
@@ -1038,8 +739,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                      <Time>0.14300098890676338</Time>
-                                      <Speed>1</Speed>
+                                  <Time>0.0026473387732952602</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1050,8 +750,44 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                      <Time>0.41501449293066628</Time>
-                                      <Speed>1</Speed>
+                                  <Time>0.60179430680919843</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.20450294221067544</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.28191395104664174</Time>
+                                  <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1066,8 +802,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                              <Time>1.2585556863362655</Time>
-                              <Speed>1</Speed>
+                          <Time>0.96819454985941356</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -1094,7 +829,6 @@
                     <c:Animation>
                       <AnimationName>JumpF</AnimationName>
                       <Time>0.5</Time>
-                          <Speed>1</Speed>
                       <Loop>false</Loop>
                     </c:Animation>
                     <c:Transform/>
@@ -1126,7 +860,7 @@
                             <c:Animation>
                               <AnimationName>DashForwardF</AnimationName>
                               <Time>1</Time>
-                                  <Speed>2</Speed>
+                              <Speed>1.7999999523162842</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -1138,7 +872,7 @@
                             <c:Animation>
                               <AnimationName>DashBackwardF</AnimationName>
                               <Time>1</Time>
-                                  <Speed>2</Speed>
+                              <Speed>1.7999999523162842</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -1157,24 +891,24 @@
                         <c:Transform/>
                       </Components>
                       <Children>
-                            <Entity name="DashLeft">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>DashLeftF</AnimationName>
-                                  <Time>1</Time>
-                                  <Speed>2</Speed>
-                                  <Loop>false</Loop>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
                         <Entity name="DashRight">
                           <Components>
                             <c:Animation>
                               <AnimationName>DashRightF</AnimationName>
                               <Time>1</Time>
-                                  <Speed>2</Speed>
+                              <Speed>1.7999999523162842</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashLeft">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashLeftF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1.7999999523162842</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -1189,99 +923,97 @@
             </Entity>
           </Children>
         </Entity>
-            <Entity name="ReloadSwitchBlend">
+        <Entity name="BlendTreeUpper">
           <Components>
             <c:Blend>
-                  <Pose1>ReloadSwitch</Pose1>
-                  <Pose2>WeaponActionBlend</Pose2>
-                  <Weight>1</Weight>
+              <Pose1>AssaultWeaponBlend</Pose1>
+              <Pose2>SidearmWeapon</Pose2>
+              <Weight>0</Weight>
               <SubTreeRoot>true</SubTreeRoot>
             </c:Blend>
             <c:Transform/>
           </Components>
           <Children>
-                <Entity name="ReloadSwitch">
+            <Entity name="AssaultWeaponBlend">
+              <Components>
+                <c:BlendAdditive>
+                  <Adder>Aim</Adder>
+                  <Receiver>WeaponBlend</Receiver>
+                </c:BlendAdditive>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponBlend">
+                  <Components>
+                    <c:BlendAdditive>
+                      <Adder>MovementBlend</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>
-                      <Time>0.00030848838797092881</Time>
-                      <Speed>1</Speed>
+                              <Speed>0.5</Speed>
+                              <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
                           </Components>
                           <Children/>
                         </Entity>
-                <Entity name="WeaponActionBlend">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>IdleBlend</Pose1>
-                      <Pose2>ShootBlend</Pose2>
-                      <Weight>0</Weight>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="IdleBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>IdlePrimary</Pose1>
-                          <Pose2>IdleSecondary</Pose2>
-                          <Weight>0</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="IdlePrimary">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>IdleAssaultRifleU</AnimationName>
-                              <Time>0.56722367394927176</Time>
-                              <Speed>1</Speed>
-                              <Play>true</Play>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="IdleSecondary">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>IdleSecWepU</AnimationName>
-                              <Time>0.57074871423905904</Time>
-                              <Speed>1</Speed>
-                              <Play>true</Play>
-                            </c:Animation>
-                            <c:Transform/>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShootBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>ShootPrimary</Pose1>
-                          <Pose2>ShootSecondary</Pose2>
-                          <Weight>0</Weight>
-                        </c:Blend>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="ShootPrimary">
+                        <Entity name="Fire">
                           <Components>
                             <c:Animation>
                               <AnimationName>ShootFastRifleU</AnimationName>
-                              <Time>0.12914212153428517</Time>
-                              <Speed>1</Speed>
+                              <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
                           </Components>
                           <Children/>
                         </Entity>
-                        <Entity name="ShootSecondary">
+                      </Children>
+                    </Entity>
+                    <Entity name="MovementBlend2">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Idle</Pose1>
+                          <Pose2>Run</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Run">
                           <Components>
                             <c:Animation>
-                              <AnimationName>ShootSecWepFastU</AnimationName>
+                              <AnimationName>IdleAssaultRifleU</AnimationName>
+                              <Time>1.6337870249215687</Time>
+                              <Play>true</Play>
+                              <Additive>true</Additive>
+                            </c:Animation>
+                            <c:Transform/>
+                          </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>
@@ -1291,6 +1023,19 @@
                     </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>
           </Children>
@@ -1327,12 +1072,12 @@
     <Entity name="PlayerName">
       <Components>
         <c:Text>
-          <Content>Insert name here</Content>
+          <Content></Content>
           <Resource>Fonts/DroidSans.ttf,100</Resource>
           <Color A="1" B="0" G="1" R="0"/>
         </c:Text>
         <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
+          <Position X="0" Y="1.64533126" Z="-0.0171071123"/>
           <Orientation X="0" Y="3.14199996" Z="0"/>
           <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
         </c:Transform>

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <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:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="CameraModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" 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"/>
-                            </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/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>2</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>3</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>4</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>1</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD/>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="0" G="0" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Blue/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.294117659" R="0"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:Animation>
-          <AnimationName1>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="AABBStanding">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.427450985" B="1" G="1" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AABBCrouching">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.745098054" B="1" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <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/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ShieldAttachment">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/PlayerAssaultFallbackRed.xml

@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:AABB>
-      <Origin X="0" Y="0.772000015" Z="0"/>
-      <Size X="1" Y="1.60000002" Z="1"/>
-    </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Collidable/>
-    <c:DashAbility/>
-    <c:DoubleJump/>
-    <c:Health/>
-    <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:Team>
-      <Team>
-        <Red/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="0" Y="0.0288832188" Z="2.64144421"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Transform>
-          <Position X="0" Y="1.27700007" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="CameraModel">
-          <Components>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform>
-              <Position X="0" Y="0.0331346765" Z="-0.0792061687"/>
-              <Scale X="1.30000007" Y="1.50000012" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HUD">
-          <Components>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.5"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Crosshair">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.200000003"/>
-                  <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HitMarkerSpawner">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="HealthBar">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:HealthHUD/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="BoostIcons">
-                      <Components>
-                        <c:BoostIconsHUD/>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="Assault">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Defender">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="Sniper">
-                          <Components>
-                            <c:Fill>
-                              <Color A="1" B="0.345098048" G="0" R="1"/>
-                            </c:Fill>
-                            <c:Sprite>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <GlowMap></GlowMap>
-                              <DepthSort>false</DepthSort>
-                              <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                              <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="ShiftAbility">
-                      <Components>
-                        <c:AbilityCooldownHUD/>
-                        <c:Fill>
-                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                          <DepthSort>false</DepthSort>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
-                          <Scale X="0.27700001" Y="0.190000013" 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"/>
-                            </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/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>2</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>3</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>4</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>1</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD/>
-                        <c:Fill>
-                          <Percentage>1</Percentage>
-                          <Color A="0.699999988" B="0" G="0" R="1"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Orientation X="0" Y="0" Z="4.71238899"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="KillFeed">
-              <Components>
-                <c:KillFeed/>
-                <c:Transform>
-                  <Position X="0.486000031" Y="0.26000002" Z="0"/>
-                  <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="KillFeed1">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed2">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-1" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="KillFeed3">
-                  <Components>
-                    <c:Text>
-                      <Content></Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Alignment>
-                        <Right/>
-                      </Alignment>
-                    </c:Text>
-                    <c:Transform>
-                      <Position X="0" Y="-2" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointArrow">
-              <Components>
-                <c:CapturePointArrowHUD/>
-                <c:Model>
-                  <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-                </c:Model>
-                <c:Team>
-                  <Team>
-                    <Red/>
-                  </Team>
-                </c:Team>
-                <c:Transform>
-                  <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-                  <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Hands">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="0.0431372561" G="0.0509803928" R="0.87843138"/>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="PrimaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>AssaultWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultRedView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="SecondaryAttachment">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:WeaponAttachment>
-                  <Weapon>SidearmWeapon</Weapon>
-                </c:WeaponAttachment>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
-                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ThirdPersonCamera">
-      <Components>
-        <c:Camera>
-          <NearClip>0.10000000149011612</NearClip>
-          <FarClip>300</FarClip>
-        </c:Camera>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="-0.284000009" Y="1.83800006" Z="1.18900001"/>
-          <Orientation X="5.95600033" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerModel">
-      <Components>
-        <c:Animation>
-          <AnimationName1>IdleF</AnimationName1>
-          <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
-        </c:Animation>
-        <c:AnimationOffset>
-          <AnimationName>AimRifle</AnimationName>
-          <Time>0.5</Time>
-        </c:AnimationOffset>
-        <c:Shielded/>
-        <c:HiddenForLocalPlayer/>
-        <c:Model>
-          <Resource>Models/Characters/Assault/AssaultRed.mesh</Resource>
-          <Color A="1" B="1" G="0.952941179" R="1"/>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="PrimaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>AssaultWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultRedWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="SecondaryAttachment">
-          <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
-            <c:WeaponAttachment>
-              <Weapon>SidearmWeapon</Weapon>
-              <Person>
-                <ThirdPerson/>
-              </Person>
-            </c:WeaponAttachment>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform>
-              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
-              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="AABBStanding">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.427450985" B="1" G="1" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-          <Scale X="1" Y="1.60000002" Z="1"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AABBCrouching">
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitCube.mesh</Resource>
-          <Color A="0.745098054" B="1" G="0" R="1"/>
-          <Visible>false</Visible>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.772000015" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <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/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="ShieldAttachment">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/DefenderShield.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0" Y="0.859000027" Z="-0.976999998"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/PlayerDefenderBlue.xml

@@ -2,6 +2,7 @@
 <Entity name="PlayerDefender" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/PlayerHUD.xml

@@ -31,116 +31,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="HealthHUD">
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="HealthBar">
-          <Components>
-            <c:Fill>
-              <Percentage>1</Percentage>
-              <Color A="0.301960796" B="1" G="0" R="0"/>
-            </c:Fill>
-            <c:HealthHUD/>
-            <c:Sprite>
-              <DiffuseTexture>Textures/HUD/HealthHudTriMain.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <Color A="0.588235319" B="0" G="0" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-              <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-              <Scale X="0.0799999982" Y="0.333000004" Z="0.150000006"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="BoostIcons">
-              <Components>
-                <c:BoostIconsHUD/>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="Sniper">
-                  <Components>
-                    <c:Fill>
-                      <Color A="1" B="0.345098048" G="0" R="1"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <DepthSort>false</DepthSort>
-                      <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.225000009" Y="0.38500002" Z="0"/>
-                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="Assault">
-                  <Components>
-                    <c:Fill>
-                      <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <DepthSort>false</DepthSort>
-                      <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.225000009" Y="0.168000013" Z="0"/>
-                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="Defender">
-                  <Components>
-                    <c:Fill>
-                      <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                    </c:Fill>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <DepthSort>false</DepthSort>
-                      <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.224999994" Y="0.27700001" Z="0"/>
-                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="HealthText">
-          <Components>
-            <c:Fill>
-              <Percentage>1</Percentage>
-              <Color A="1" B="1" G="0" R="0"/>
-            </c:Fill>
-            <c:Text>
-              <Content>100/100</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-            </c:Text>
-            <c:HealthHUD/>
-            <c:Transform>
-              <Position X="-0.372000009" Y="-0.212000012" Z="0.0560000017"/>
-              <Orientation X="0" Y="0.410000026" Z="0"/>
-              <Scale X="0.0189999994" Y="0.0250000004" Z="0.0350000001"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
     <Entity name="CapturePointHUD">
       <Components>
         <c:Transform>
@@ -154,40 +44,7 @@
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <GlowMap></GlowMap>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>2</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <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>
@@ -197,15 +54,16 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>3</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>3</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -222,6 +80,7 @@
             <c:Sprite>
               <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>
@@ -231,16 +90,17 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>4</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Percentage>1</Percentage>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>4</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -257,6 +117,43 @@
             <c:Sprite>
               <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>
+              <Position X="0" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>2</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <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>
@@ -266,15 +163,16 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>1</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>1</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -291,6 +189,7 @@
             <c:Sprite>
               <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>
@@ -300,14 +199,15 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD/>
                 <c:Fill>
                   <Percentage>1</Percentage>
                   <Color A="0.699999988" B="0" G="0" R="1"/>
                 </c:Fill>
+                <c:CapturePointHUD/>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
@@ -377,23 +277,157 @@
     </Entity>
     <Entity name="CapturePointArrow">
       <Components>
-        <c:CapturePointArrowHUD/>
-        <c:Model>
-          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-        </c:Model>
         <c:Team>
           <Team>
             <Blue/>
           </Team>
         </c:Team>
+        <c:CapturePointArrowHUD/>
+        <c:Model>
+          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+        </c:Model>
         <c:Transform>
-          <Position X="0" Y="0.714000046" Z="-1.30000007"/>
-          <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
-          <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <Position X="0" Y="0.198665127" Z="0"/>
+          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="HealthHUDAssault">
+      <Components>
+        <c:Transform>
+          <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+          <Orientation X="5.83699989" Y="0" Z="4.71199989"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="HealthText">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="1" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:Text>
+              <Content>100/100</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:HealthHUD/>
+            <c:Transform>
+              <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
+              <Orientation X="0" Y="0" Z="1.57070696"/>
+              <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="HealthBar">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="0.301960796" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:HealthHUD/>
+            <c:Sprite>
+              <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="BoostIcons">
+          <Components>
+            <c:BoostIconsHUD/>
+            <c:Transform>
+              <Position X="0" Y="0.00500000035" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Assault">
+              <Components>
+                <c:Fill>
+                  <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0" B="0.0392156877" G="0.184313729" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <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>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Defender">
+              <Components>
+                <c:Fill>
+                  <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0" B="0.34117648" G="0.192156866" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <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>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Sniper">
+              <Components>
+                <c:Fill>
+                  <Color A="1" B="0.345098048" G="0" R="1"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0" B="0.121568628" G="0" R="0.443137258"/>
+                </c:Sprite>
+                <c:Transform>
+                  <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>
               </Components>
               <Children/>
             </Entity>
           </Children>
+        </Entity>
+        <Entity name="ShiftAbility">
+          <Components>
+            <c:AbilityCooldownHUD/>
+            <c:Fill>
+              <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+            </c:Fill>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/Abilities/Superman-01.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
+              <Orientation X="0" Y="0" Z="3.14159203"/>
+              <Scale X="0.0800000057" Y="0.0700000003" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
 
 </Entity>

resources/Schema/Entities/PlayerRed.xml

@@ -2,6 +2,7 @@
 <Entity name="Player" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:NetworkComponent/>
     <c:AABB>
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>

resources/Schema/Entities/QualityAssurance.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:CapturePointGameMode>
-      <RespawnTime>4.7473226580121377</RespawnTime>
+      <RespawnTime>3.6154132075906489</RespawnTime>
     </c:CapturePointGameMode>
     <c:Transform>
       <Position X="0" Y="-1" Z="0"/>
@@ -11,6 +11,104 @@
   </Components>
 
   <Children>
+    <Entity name="AnimationTestOrigin">
+      <Components>
+        <c:Transform>
+          <Position X="-9.21499538" Y="0" Z="8.55711079"/>
+          <Orientation X="0" Y="4.829" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="RunAnim">
+          <Components>
+            <c:Animation>
+              <AnimationName></AnimationName>
+            </c:Animation>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0.786919653" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Walkanim">
+          <Components>
+            <c:Animation>
+              <AnimationName></AnimationName>
+            </c:Animation>
+            <c:Model>
+              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AnimationText">
+          <Components>
+            <c:Text>
+              <Content>Animation test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="2.4000001" Z="0"/>
+              <Orientation X="0" Y="3.08300018" Z="0"/>
+            </c:Transform>
+          </Components>
+          <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="-1.10000002" Y="-0.231354833" Z="0"/>
+            </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="2907.64526" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Asset">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName></AnimationName>
+                    </c:Animation>
+                    <c:Model>
+                      <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="0.5" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
     <Entity name="Ground">
       <Components>
         <c:AABB/>
@@ -43,7 +141,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="9038.11328" Z="0"/>
+              <Orientation X="0" Y="9141.29785" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -96,115 +194,11 @@
         </c:Model>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="18876.6172" Z="0"/>
+          <Orientation X="4.16300011" Y="18980.4727" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
     </Entity>
-    <Entity name="AnimationTestOrigin">
-      <Components>
-        <c:Transform>
-          <Position X="-9.21499538" Y="0" Z="8.55711079"/>
-          <Orientation X="0" Y="4.829" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="RunAnim">
-          <Components>
-            <c:Animation>
-              <AnimationName1></AnimationName1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="0.786919653" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Walkanim">
-          <Components>
-            <c:Animation>
-              <AnimationName1></AnimationName1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AnimationText">
-          <Components>
-            <c:Text>
-              <Content>Animation test</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="2.4000001" Z="0"/>
-              <Orientation X="0" Y="3.08300018" Z="0"/>
-            </c:Transform>
-          </Components>
-          <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="-1.10000002" Y="-0.231354833" Z="0"/>
-            </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="2856.05518" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Asset">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName1></AnimationName1>
-                      <AnimationName2></AnimationName2>
-                      <AnimationName3></AnimationName3>
-                    </c:Animation>
-                    <c:Model>
-                      <Resource>Models/Characters/Assault/AssaultAnimated.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="0" Y="0.5" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
     <Entity name="SpheresOrigin">
       <Components>
         <c:Transform>
@@ -228,7 +222,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="17467.0977" Y="17467.0977" Z="17467.0977"/>
+              <Orientation X="17570.9531" Y="17570.9531" Z="17570.9531"/>
             </c:Transform>
           </Components>
           <Children>
@@ -292,7 +286,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="17263.0938" Z="0"/>
+              <Orientation X="0" Y="17366.9492" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -324,7 +318,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="12630.0664" Y="17990.5039" Z="5383.80176"/>
+                      <Orientation X="12702.4932" Y="18094.3594" Z="5414.53027"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -395,15 +389,15 @@
       <Children>
         <Entity name="SpawnerRedTeam">
           <Components>
-            <c:PlayerSpawn/>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/Player.xml</EntityFile>
-            </c:Spawner>
             <c:Team>
               <Team>
                 <Red/>
               </Team>
             </c:Team>
+            <c:PlayerSpawn/>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/Player.xml</EntityFile>
+            </c:Spawner>
             <c:Transform>
               <Position X="0" Y="0" Z="-3"/>
             </c:Transform>
@@ -465,15 +459,15 @@
         </Entity>
         <Entity name="SpawnerBlueTeam">
           <Components>
-            <c:PlayerSpawn/>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/Player.xml</EntityFile>
-            </c:Spawner>
             <c:Team>
               <Team>
                 <Blue/>
               </Team>
             </c:Team>
+            <c:PlayerSpawn/>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/Player.xml</EntityFile>
+            </c:Spawner>
             <c:Transform>
               <Position X="0" Y="0" Z="3"/>
               <Orientation X="0" Y="3.20000005" Z="0"/>
@@ -559,8 +553,8 @@
         <Entity name="Cube1">
           <Components>
             <c:Model>
-              <Resource>Models/Core/UnitCube.mesh</Resource>
-              <Color A="0.505882382" B="0" G="1" R="0"/>
+              <Resource>Models/BushAlive.mesh</Resource>
+              <Color A="1" B="0" G="1" R="0"/>
               <Transparent>true</Transparent>
             </c:Model>
             <c:Transform>
@@ -619,8 +613,8 @@
             </c:Model>
             <c:Transform>
               <Position X="1.16991854" Y="0.5" Z="-1.42708254"/>
-              <Scale X="3.70000029" Y="1" Z="1"/>
               <Orientation X="1.80400014" Y="3.6650002" Z="4.94500017"/>
+              <Scale X="3.70000029" Y="1" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -674,7 +668,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -721,7 +715,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -781,7 +775,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -828,7 +822,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -874,7 +868,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -921,7 +915,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -968,7 +962,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1153.80225" Z="0"/>
+                  <Orientation X="0" Y="1205.41614" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1023,22 +1017,22 @@
               <Components>
                 <c:AABB/>
                 <c:CapturePoint>
+                  <CaptureTimer>15</CaptureTimer>
                   <HomePointForTeam>
                     <Red/>
                   </HomePointForTeam>
-                  <CaptureTimer>15</CaptureTimer>
                 </c:CapturePoint>
+                <c:Team>
+                  <Team>
+                    <Red/>
+                  </Team>
+                </c:Team>
                 <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="0" G="0" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
-                <c:Team>
-                  <Team>
-                    <Red/>
-                  </Team>
-                </c:Team>
                 <c:Transform>
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
@@ -1054,8 +1048,8 @@
                 </c:Text>
                 <c:Transform>
                   <Position X="0" Y="4" Z="0"/>
-                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                   <Orientation X="0" Y="4.71200037" Z="0"/>
+                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1078,13 +1072,13 @@
                 <c:CapturePoint>
                   <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"/>
                   <Transparent>true</Transparent>
                 </c:Model>
-                <c:Team/>
                 <c:Transform>
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
@@ -1100,8 +1094,8 @@
                 </c:Text>
                 <c:Transform>
                   <Position X="0" Y="4" Z="0"/>
-                  <Scale X="0.400000006" Y="0.400000006" Z="1"/>
                   <Orientation X="0" Y="4.71200037" Z="0"/>
+                  <Scale X="0.400000006" Y="0.400000006" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1122,13 +1116,13 @@
                 <c:CapturePoint>
                   <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"/>
                   <Transparent>true</Transparent>
                 </c:Model>
-                <c:Team/>
                 <c:Transform>
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
@@ -1144,8 +1138,8 @@
                 </c:Text>
                 <c:Transform>
                   <Position X="0" Y="4" Z="0"/>
-                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                   <Orientation X="0" Y="4.71200037" Z="0"/>
+                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1168,13 +1162,13 @@
                 <c:CapturePoint>
                   <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"/>
                   <Transparent>true</Transparent>
                 </c:Model>
-                <c:Team/>
                 <c:Transform>
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
@@ -1190,8 +1184,8 @@
                 </c:Text>
                 <c:Transform>
                   <Position X="0" Y="4" Z="0"/>
-                  <Scale X="0.400000006" Y="0.400000006" Z="1"/>
                   <Orientation X="0" Y="4.71200037" Z="0"/>
+                  <Scale X="0.400000006" Y="0.400000006" Z="1"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1212,23 +1206,23 @@
               <Components>
                 <c:AABB/>
                 <c:CapturePoint>
+                  <CaptureTimer>-15</CaptureTimer>
                   <HomePointForTeam>
                     <Blue/>
                   </HomePointForTeam>
-                  <CaptureTimer>-15</CaptureTimer>
                   <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
+                <c:Team>
+                  <Team>
+                    <Blue/>
+                  </Team>
+                </c:Team>
                 <c:Trigger/>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
                   <Color A="0.300000012" B="1" G="0" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
-                <c:Team>
-                  <Team>
-                    <Blue/>
-                  </Team>
-                </c:Team>
                 <c:Transform>
                   <Position X="0" Y="2" Z="0"/>
                   <Scale X="8" Y="4" Z="8"/>
@@ -1244,8 +1238,8 @@
                 </c:Text>
                 <c:Transform>
                   <Position X="0" Y="4" Z="0"/>
-                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                   <Orientation X="0" Y="4.71200037" Z="0"/>
+                  <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1285,8 +1279,8 @@
             </c:Text>
             <c:Transform>
               <Position X="0" Y="13.1000004" Z="0"/>
-              <Scale X="2" Y="2" Z="2"/>
               <Orientation X="0" Y="3.08300018" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -1382,7 +1376,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1687.52917" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1391,7 +1385,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>2.5396116058983438</TimeSinceDeath>
+                      <TimeSinceDeath>1.5712751414989441</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1438,7 +1432,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1687.52917" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1447,7 +1441,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.5396208215609732</TimeSinceDeath>
+                      <TimeSinceDeath>0.85439856235552725</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1490,22 +1484,20 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1687.52917" Z="0"/>
+                  <Orientation X="0" Y="1739.14307" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="Asset">
                   <Components>
                     <c:Animation>
-                      <AnimationName1></AnimationName1>
-                      <AnimationName2></AnimationName2>
-                      <AnimationName3></AnimationName3>
+                      <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>1.5396208215609732</TimeSinceDeath>
+                      <TimeSinceDeath>0.85439856235552725</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1550,7 +1542,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1695.30933" Z="0"/>
+                  <Orientation X="0" Y="1746.92322" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1560,7 +1552,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>4.4522528839264339</TimeSinceDeath>
+                      <TimeSinceDeath>7.5223549108000043</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
@@ -1608,7 +1600,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1293.42383" Z="0"/>
+                  <Orientation X="0" Y="1345.03772" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1618,7 +1610,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>3.2362842141074992</TimeSinceDeath>
+                      <TimeSinceDeath>0.39702717854592606</TimeSinceDeath>
                       <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
@@ -1655,8 +1647,8 @@
             </c:Text>
             <c:Transform>
               <Position X="7.57566977" Y="8.63030624" Z="-0.00154382922"/>
-              <Scale X="2" Y="2" Z="1"/>
               <Orientation X="0" Y="1.5710001" Z="0"/>
+              <Scale X="2" Y="2" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -1701,6 +1693,11 @@
               <Origin X="0" Y="0.772000015" Z="0"/>
               <Size X="1" Y="1.60000002" Z="1"/>
             </c:AABB>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
             <c:Collidable/>
             <c:Health/>
             <c:Physics>
@@ -1711,11 +1708,6 @@
               <MovementSpeed>5</MovementSpeed>
               <CurrentWeapon></CurrentWeapon>
             </c:Player>
-            <c:Team>
-              <Team>
-                <Red/>
-              </Team>
-            </c:Team>
             <c:Transform>
               <Position X="-1.56735241" Y="0.527999997" Z="0.929739475"/>
             </c:Transform>
@@ -1738,8 +1730,8 @@
                     </c:Text>
                     <c:Transform>
                       <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
-                      <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
                       <Orientation X="0" Y="3.14199996" Z="0"/>
+                      <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1777,8 +1769,8 @@
                         </c:Model>
                         <c:Transform>
                           <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
-                          <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
                           <Orientation X="0" Y="0.594000041" Z="0"/>
+                          <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -1790,8 +1782,8 @@
                         </c:Model>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.200000003"/>
-                          <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
                           <Orientation X="1.57000005" Y="0" Z="0"/>
+                          <Scale X="0.00600000005" Y="1" Z="0.00600000005"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -1801,7 +1793,7 @@
                         <c:ExplosionEffect>
                           <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>2.5396116058983438</TimeSinceDeath>
+                          <TimeSinceDeath>1.5712751414989441</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
@@ -1845,9 +1837,7 @@
             <Entity name="PlayerModel">
               <Components>
                 <c:Animation>
-                  <AnimationName1></AnimationName1>
-                  <AnimationName2></AnimationName2>
-                  <AnimationName3></AnimationName3>
+                  <AnimationName></AnimationName>
                 </c:Animation>
                 <c:Shielded/>
                 <c:HiddenForLocalPlayer/>
@@ -1915,8 +1905,8 @@
                 </c:Model>
                 <c:Transform>
                   <Position X="-4.95900011" Y="0" Z="1.29897511"/>
-                  <Scale X="5" Y="5" Z="5"/>
                   <Orientation X="0.407000005" Y="1.68700004" Z="0"/>
+                  <Scale X="5" Y="5" Z="5"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -1991,20 +1981,20 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>2</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>2</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                   <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2025,20 +2015,20 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>3</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>3</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                   <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2059,21 +2049,21 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>4</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Percentage>1</Percentage>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>4</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                   <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2094,20 +2084,20 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>1</CapturePointNumber>
-                </c:CapturePointHUD>
                 <c:Fill>
                   <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                 </c:Fill>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>1</CapturePointNumber>
+                </c:CapturePointHUD>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                   <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2128,19 +2118,19 @@
           <Children>
             <Entity name="ProgressionHexagon">
               <Components>
-                <c:CapturePointHUD/>
                 <c:Fill>
                   <Percentage>1</Percentage>
                   <Color A="0.699999988" B="0" G="0" R="1"/>
                 </c:Fill>
+                <c:CapturePointHUD/>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                   <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                   <Orientation X="0" Y="0" Z="4.71238899"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -2166,14 +2156,24 @@
               <Position X="0" Y="1.32321239" Z="0"/>
             </c:Transform>
           </Components>
+          <Children>
+            <Entity name="Spawner">
+              <Components>
+                <c:Spawner>
+                  <EntityFile></EntityFile>
+                </c:Spawner>
+                <c:Transform/>
+              </Components>
               <Children/>
             </Entity>
           </Children>
         </Entity>
+      </Children>
+    </Entity>
     <Entity name="MenuOirign">
       <Components>
         <c:Transform>
-          <Position X="-23.0533829" Y="0.938369572" Z="14.068408"/>
+          <Position X="0" Y="0.600000024" Z="-1.86100006"/>
         </c:Transform>
       </Components>
       <Children>
@@ -2374,7 +2374,9 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
+                      <BlurBackground>true</BlurBackground>
                       <GlowMap></GlowMap>
+                      <Color A="0" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
                       <Position X="0" Y="0" Z="-1"/>
@@ -2387,6 +2389,7 @@
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                           <GlowMap></GlowMap>
+                          <Visible>false</Visible>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.375197947" Z="0.0627754927"/>
@@ -2400,6 +2403,7 @@
                               <Content>1920x1080</Content>
                               <Resource>Fonts/DroidSans.ttf,64</Resource>
                               <Color A="1" B="1" G="0.847058833" R="0"/>
+                              <Visible>false</Visible>
                             </c:Text>
                             <c:Transform>
                               <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
@@ -2416,6 +2420,7 @@
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                           <GlowMap></GlowMap>
+                          <Visible>false</Visible>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0.199327558" Z="0.0627754927"/>
@@ -2429,6 +2434,7 @@
                               <Content>1280x720</Content>
                               <Resource>Fonts/DroidSans.ttf,64</Resource>
                               <Color A="1" B="1" G="0.847058833" R="0"/>
+                              <Visible>false</Visible>
                             </c:Text>
                             <c:Transform>
                               <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
@@ -2540,20 +2546,20 @@
       <Children>
         <Entity name="CapturePointArrow">
           <Components>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
             <c:CapturePointArrowHUD>
               <CurrentTarget>2</CurrentTarget>
             </c:CapturePointArrowHUD>
             <c:Model>
               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
-            <c:Team>
-              <Team>
-                <Red/>
-              </Team>
-            </c:Team>
             <c:Transform>
+              <Orientation X="-0.26696983" Y="-0.146981478" Z="0"/>
               <Scale X="10.7000008" Y="1.4000001" Z="5.30000019"/>
-              <Orientation X="-0.648448348" Y="-0.417814791" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>

resources/Schema/Entities/ReloadEffectView.xml

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

resources/Schema/Entities/ScoreBoard.xml

@@ -2,6 +2,7 @@
 <Entity name="ScoreBoardOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:NetworkComponent/>
     <c:Transform>
       <Position X="66.4319992" Y="37.9560013" Z="0"/>
       <Orientation X="0" Y="4.71199989" Z="0"/>

resources/Schema/Entities/ServerIdentity.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ServerIdentity_Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="ServerIdentity">
+      <Components>
+        <c:ServerIdentity/>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="IP">
+          <Components>
+            <c:Text>
+              <Content>123.123.123.123</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:TextFieldReader>
+              <ParentEntityName>ServerIdentity</ParentEntityName>
+              <ComponentType>ServerIdentity</ComponentType>
+              <Field>IP</Field>
+            </c:TextFieldReader>
+            <c:Transform>
+              <Position X="-0.200000003" Y="-0.100000001" Z="0"/>
+              <Scale X="0.649999976" Y="0.649999976" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Port">
+          <Components>
+            <c:Text>
+              <Content>65999</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:TextFieldReader>
+              <ParentEntityName>ServerIdentity</ParentEntityName>
+              <ComponentType>ServerIdentity</ComponentType>
+              <Field>Port</Field>
+            </c:TextFieldReader>
+            <c:Transform>
+              <Position X="4.70000029" Y="-0.100000001" Z="0"/>
+              <Scale X="0.649999976" Y="0.649999976" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ServerName">
+          <Components>
+            <c:Text>
+              <Content>UnkownServer</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:TextFieldReader>
+              <ParentEntityName>ServerIdentity</ParentEntityName>
+              <ComponentType>ServerIdentity</ComponentType>
+              <Field>ServerName</Field>
+            </c:TextFieldReader>
+            <c:Transform>
+              <Position X="-8.60000038" Y="-0.100000001" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="PlayersConnected">
+          <Components>
+            <c:Text>
+              <Content>0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:TextFieldReader>
+              <ParentEntityName>ServerIdentity</ParentEntityName>
+              <ComponentType>ServerIdentity</ComponentType>
+              <Field>PlayersConnected</Field>
+            </c:TextFieldReader>
+            <c:Transform>
+              <Position X="7.80000019" Y="0" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="ServerIdentityConnect">
+          <Components>
+            <c:Button/>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+              <BlurBackground>true</BlurBackground>
+              <GlowMap></GlowMap>
+              <DepthSort>false</DepthSort>
+              <Color A="0.588235319" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.100000001" Y="0.496000022" Z="0"/>
+              <Scale X="18.1000004" Y="2" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ServerList.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ServerList" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:ServerList>
+      <Offset X="0" Y="-2.20000005" Z="0"/>
+    </c:ServerList>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="Identities_Origin">
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="0.181182757" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="ServerIdentitySpawner">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/ServerIdentity.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0" Y="0" Z="0.00999999978"/>
+              <Scale X="0.0149999997" Y="0.0149999997" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Background">
+      <Components>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+          <BlurBackground>true</BlurBackground>
+          <GlowMap></GlowMap>
+          <Color A="0.196078435" B="0" G="0" R="0"/>
+        </c:Sprite>
+        <c:Transform>
+          <Scale X="0.300000012" Y="0.5" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="RefreshButton">
+      <Components>
+        <c:Button/>
+        <c:Sprite>
+          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+          <BlurBackground>true</BlurBackground>
+          <GlowMap></GlowMap>
+          <Color A="0.588235319" B="1" G="1" R="1"/>
+        </c:Sprite>
+        <c:InputCmdButton>
+          <Command>RefreshServerList</Command>
+          <PressValue>1</PressValue>
+        </c:InputCmdButton>
+        <c:Transform>
+          <Position X="0.120867848" Y="0.222928733" Z="0.0189953279"/>
+          <Scale X="0.0149999997" Y="0.0149999997" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="RefreshIcon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Icons/rotate.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="1" B="1" G="0" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="-0.245000005" Z="0.00999999978"/>
+              <Scale X="0.690000057" Y="1.37600005" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ShinyStoneCrystalBlueLights.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ShinyStoneCrystalBlueLights" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+		<c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:PointLight>
+          <Color A="1" B="1" G="0" R="0"/>
+          <Radius>5</Radius>
+          <Intensity>2</Intensity>
+          <Falloff>0.5</Falloff>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="-0.030024644" Y="1.9786495" Z="-0.242380202"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:PointLight>
+          <Color A="1" B="1" G="0.454901963" R="0"/>
+          <Radius>5</Radius>
+          <Intensity>2</Intensity>
+          <Falloff>0.5</Falloff>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="-0.030024644" Y="0.980793118" Z="-0.242380202"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ShootingRange.xml

@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ShootingRange" 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.736272275" Z="-10.0567217"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="TargetBoard">
+      <Components>
+        <c:Transform>
+          <Position X="-2" Y="0" Z="0"/>
+          <Orientation X="1.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1" G="0.392156869" R="0"/>
+            </c:Model>
+            <c:Transform>
+              <Scale X="1" Y="0.100000001" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="1" B="0" G="0" R="1"/>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="0.850000024" Y="1.10000002" Z="0.850000024"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                      <Color A="1" B="1" G="0.392156869" R="0"/>
+                    </c:Model>
+                    <c:Transform>
+                      <Scale X="0.800000012" Y="1.10000002" Z="0.800000012"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                          <Color A="1" B="0" G="0" R="1"/>
+                        </c:Model>
+                        <c:Transform>
+                          <Scale X="0.699999988" Y="1.10000002" Z="0.699999988"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Model>
+                              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                              <Color A="1" B="1" G="0.392156869" R="0"/>
+                            </c:Model>
+                            <c:Transform>
+                              <Scale X="0.600000024" Y="1.10000002" Z="0.600000024"/>
+                            </c:Transform>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Model>
+                                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                                  <Color A="1" B="0" G="0.00392156886" R="1"/>
+                                </c:Model>
+                                <c:Transform>
+                                  <Scale X="0.200000003" Y="1.10000002" Z="0.200000003"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="TargetBoard">
+      <Components>
+        <c:Transform>
+          <Orientation X="1.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1" G="0.392156869" R="0"/>
+            </c:Model>
+            <c:Transform>
+              <Scale X="1" Y="0.100000001" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="1" B="0" G="0" R="1"/>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="0.850000024" Y="1.10000002" Z="0.850000024"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                      <Color A="1" B="1" G="0.392156869" R="0"/>
+                    </c:Model>
+                    <c:Transform>
+                      <Scale X="0.800000012" Y="1.10000002" Z="0.800000012"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                          <Color A="1" B="0" G="0" R="1"/>
+                        </c:Model>
+                        <c:Transform>
+                          <Scale X="0.699999988" Y="1.10000002" Z="0.699999988"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Model>
+                              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                              <Color A="1" B="1" G="0.392156869" R="0"/>
+                            </c:Model>
+                            <c:Transform>
+                              <Scale X="0.600000024" Y="1.10000002" Z="0.600000024"/>
+                            </c:Transform>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Model>
+                                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                                  <Color A="1" B="0" G="0.00392156886" R="1"/>
+                                </c:Model>
+                                <c:Transform>
+                                  <Scale X="0.200000003" Y="1.10000002" Z="0.200000003"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="TargetBoard">
+      <Components>
+        <c:Transform>
+          <Position X="2" Y="0" Z="0"/>
+          <Orientation X="1.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+              <Color A="1" B="1" G="0.392156869" R="0"/>
+            </c:Model>
+            <c:Transform>
+              <Scale X="1" Y="0.100000001" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                  <Color A="1" B="0" G="0" R="1"/>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="0.850000024" Y="1.10000002" Z="0.850000024"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Model>
+                      <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                      <Color A="1" B="1" G="0.392156869" R="0"/>
+                    </c:Model>
+                    <c:Transform>
+                      <Scale X="0.800000012" Y="1.10000002" Z="0.800000012"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Model>
+                          <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                          <Color A="1" B="0" G="0" R="1"/>
+                        </c:Model>
+                        <c:Transform>
+                          <Scale X="0.699999988" Y="1.10000002" Z="0.699999988"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Model>
+                              <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                              <Color A="1" B="1" G="0.392156869" R="0"/>
+                            </c:Model>
+                            <c:Transform>
+                              <Scale X="0.600000024" Y="1.10000002" Z="0.600000024"/>
+                            </c:Transform>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Model>
+                                  <Resource>Models/Core/UnitCylinder.mesh</Resource>
+                                  <Color A="1" B="0" G="0.00392156886" R="1"/>
+                                </c:Model>
+                                <c:Transform>
+                                  <Scale X="0.200000003" Y="1.10000002" Z="0.200000003"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ThirdPersonBlendTree.xml

@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PlayerModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>BlendTreeAim</Adder>
+      <Receiver>BlendTreeAssault</Receiver>
+    </c:BlendAdditive>
+    <c:Shielded/>
+    <c:HiddenForLocalPlayer/>
+    <c:Model>
+      <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+      <Color A="1" B="1" G="0.25" R="0"/>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="PrimaryAttachment">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:WeaponAttachment>
+          <Weapon>AssaultWeapon</Weapon>
+          <Person>
+            <ThirdPerson/>
+          </Person>
+        </c:WeaponAttachment>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.158476353" Y="1.07276821" Z="-0.235679001"/>
+          <Orientation X="0.150311232" Y="-0.0436343439" Z="0.10047026"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="SecondaryAttachment">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:WeaponAttachment>
+          <Weapon>SidearmWeapon</Weapon>
+          <Person>
+            <ThirdPerson/>
+          </Person>
+        </c:WeaponAttachment>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.158476353" Y="1.07276821" Z="-0.235679001"/>
+          <Orientation X="0.150311232" Y="-0.0436343439" Z="0.10047026"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BlendTreeAim">
+      <Components>
+        <c:Blend>
+          <Pose1>AimPrimary</Pose1>
+          <Pose2>AimSecondary</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="AimSecondary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimSecWepA</AnimationName>
+              <Time>0.57222229242324829</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AimPrimary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimRifleA</AnimationName>
+              <Time>0.57222229242324829</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="BlendTreeAssault">
+      <Components>
+        <c:BlendOverride>
+          <Master>ReloadSwitchBlend</Master>
+          <Slave>FinalMovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="FinalMovementBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>StandCrouchBlend</Pose1>
+              <Pose2>JumpDashBlend</Pose2>
+              <Weight>2.5146881298480398e-63</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="StandCrouchBlend">
+              <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>MovementBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="MovementBlend">
+                      <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.37873000664436773</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeRightF</AnimationName>
+                                  <Time>0.30605146859515031</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchWalkF</AnimationName>
+                              <Time>0.084425453772553283</Time>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchF</AnimationName>
+                          <Time>0.99862473341677438</Time>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="StandMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>MovementBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="MovementBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>RunWalkBlend</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="RunWalkBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Walk</Pose1>
+                              <Pose2>Run</Pose2>
+                              <Weight>1</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Walk">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>WalkF</AnimationName>
+                                  <Time>0.58958008318232658</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Run">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>RunF</AnimationName>
+                                  <Time>0.45938030142915665</Time>
+                                  <Play>true</Play>
+                                  <Reverse>true</Reverse>
+                                </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.77117270421586426</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeRightF</AnimationName>
+                                  <Time>0.79468823409597888</Time>
+                                  <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.8384679867885865</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>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBackward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashBackwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</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>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashRight">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashRightF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>2</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="ReloadSwitchBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>ReloadSwitch</Pose1>
+              <Pose2>WeaponActionBlend</Pose2>
+              <Weight>1</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="ReloadSwitch">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchU</AnimationName>
+                  <Time>0.00030848838797092881</Time>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="WeaponActionBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>IdleBlend</Pose1>
+                  <Pose2>ShootBlend</Pose2>
+                  <Weight>0</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="IdleBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>IdlePrimary</Pose1>
+                      <Pose2>IdleSecondary</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="IdlePrimary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleAssaultRifleU</AnimationName>
+                          <Time>1.0138027682248349</Time>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="IdleSecondary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleSecWepU</AnimationName>
+                          <Time>1.0173278085146222</Time>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ShootBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>ShootPrimary</Pose1>
+                      <Pose2>ShootSecondary</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ShootPrimary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootFastRifleU</AnimationName>
+                          <Time>0.12914212153428517</Time>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ShootSecondary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootSecWepFastU</AnimationName>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>