Tiny compiler bug fix.

Removed superfluous .Valid() checks.

Check for spectator spawnrequest in case they somehow has a class, so we don't get "x players were supposed to be spawned but failed" if it happens.

include/Engine/Core/EPlayerDeath.h

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

include/Engine/Core/System.h

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

include/Engine/Editor/EditorCameraInputController.h

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

include/Engine/Input/FirstPersonInputController.h

@@ -6,12 +6,13 @@
 #include "../Core/ELockMouse.h"
 #include "../Game/Events/EDashAbility.h"
 #include "InputHandler.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 template <typename EventContext>
 class FirstPersonInputController : public InputController<EventContext>
 {
 public:
-    FirstPersonInputController(EventBroker* eventBroker, int playerID);
+    FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
@@ -34,6 +35,8 @@ public:
 
 protected:
     const int m_PlayerID;
+    EntityWrapper m_PlayerEntity;
+
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
@@ -65,9 +68,10 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity)
     : InputController(eventBroker)
     , m_PlayerID(playerID)
+    , m_PlayerEntity(playerEntity)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
     EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
@@ -118,13 +122,84 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
         if (e.Command == "Forward") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.z = -val;
+
+            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) {
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        if (m_Crouching) {
+                            aeb.NodeName = "Walk";
+                        } else {
+                            aeb.NodeName = "Run";
+                        }
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        aeb.Reverse = true;
+                        m_EventBroker->Publish(aeb);
+                    } else {
+                        
+                    }
+                }
+            }
         }
         if (e.Command == "Right") {
             float val = glm::clamp(e.Value, -1.f, 1.f);
             m_Movement.x = val;
+
+            if (m_PlayerEntity.Valid()) {
+                EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+
+                if (playerModel.Valid()) {
+                    if (val > 0) {
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Right";
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    } else if (val < 0) {
+                        Events::AutoAnimationBlend aeb;
+                        aeb.Duration = 0.1;
+                        aeb.NodeName = "Left";
+                        aeb.RootNode = playerModel;
+                        aeb.Start = true;
+                        m_EventBroker->Publish(aeb);
+                    } else {
+                        
+
+                    }
+                }
+            }
+            
         }
         if (glm::length2(m_Movement) > 0) {
             m_Movement = glm::normalize(m_Movement);
+        } else {
+            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;
+                    m_EventBroker->Publish(aeb);
+                }
+            }
         }
     }
 
@@ -159,6 +234,32 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
 
     if (e.Command == "Crouch") {
         m_Crouching = e.Value > 0;
+
+        if (m_PlayerEntity.Valid()) {
+            EntityWrapper playerModel = m_PlayerEntity.FirstChildByName("PlayerModel");
+            if (playerModel.Valid()) {
+                if (e.Value == 0.f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "StandMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                } else if(e.Value == 1.0f) {
+                    Events::AutoAnimationBlend aeb;
+                    aeb.Duration = 0.3;
+                    aeb.NodeName = "CrouchMovement";
+                    aeb.RootNode = playerModel;
+                    aeb.Start = true;
+                    aeb.Restart = true;
+                    aeb.SingleLevelBlend = true;
+                    m_EventBroker->Publish(aeb);
+                }
+            }
+        }
+        
     }
 
     if (e.Command == "SpecialAbility") {

include/Engine/Network/Client.h

@@ -52,7 +52,7 @@ public:
     void Connect(std::string address, int port);
     void Update() override;
 private:
-    UDPClient m_Unreliable;
+    //UDPClient m_Unreliable;
     TCPClient m_Reliable;
     std::vector<Events::PlayerSpawned> m_PlayerSpawnEvents;
     void parseSpawnEvents();

include/Engine/Network/EKillDeath.h

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

include/Engine/Network/EPlayerConnected.h

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

include/Engine/Network/Server.h

@@ -21,6 +21,9 @@
 #include "Core/EEntityDeleted.h"
 #include "Core/EComponentDeleted.h"
 #include "Core/EAmmoPickup.h"
+#include "Core/EPlayerDeath.h"
+#include "Network/EPlayerConnected.h"
+#include "Network/EKillDeath.h"
 
 class Server : public Network
 {
@@ -33,7 +36,7 @@ public:
 private:
     // Network channels
     TCPServer m_Reliable;
-    UDPServer m_Unreliable;
+    //UDPServer m_Unreliable;
     UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
@@ -77,7 +80,8 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID GetPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEndpoint();
+    PlayerID getPlayerIDFromEntityID(EntityID entityID);
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -103,6 +107,8 @@ private:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Server, Events::AmmoPickup> m_EAmmoPickup;
     bool OnAmmoPickup(const Events::AmmoPickup& e);
+    EventRelay<Server, Events::PlayerDeath> m_EPlayerDeath;
+    bool OnPlayerDeath(const Events::PlayerDeath& e);
 };
 
 #endif

include/Engine/Rendering/BlendTree.h

@@ -62,6 +62,7 @@ public:
         double progress;
         bool Start;
         bool SingleBlend;
+        double Weight;
         std::unordered_map<EntityWrapper, double> StartWeights;
     };
 

include/Engine/Rendering/EAutoAnimationBlend.h

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

include/Game/Systems/AbilityCooldownHUDSystem.h

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

include/Game/Systems/PlayerDeathSystem.h

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

include/Game/Systems/PlayerMovementSystem.h

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

include/Game/Systems/PlayerSpawnSystem.h

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

include/Game/Systems/ScoreScreenSystem.h

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

include/Game/Systems/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/TextFieldReader.h

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

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

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

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -9,6 +9,7 @@
 #include "Systems/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
+#include "Rendering/EAutoAnimationBlend.h"
 
 template <typename ETYPE>
 class WeaponBehaviour : public PureSystem
@@ -31,6 +32,21 @@ public:
 
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cWeapon, double dt) override
     {
+        EntityWrapper firstPersonWeapon = entity.FirstChildByName("Hands").FirstChildByName("AssaultWeapon");
+        EntityWrapper thirdPersonWeapon = entity.FirstChildByName("PlayerModel").FirstChildByName("AssaultWeapon");
+        if (IsClient && (firstPersonWeapon.Valid() || thirdPersonWeapon.Valid())) {
+            if (m_ActiveWeapons.count(entity) == 0) {
+
+                WeaponInfo& wi = m_ActiveWeapons[entity];
+                wi.Player = entity;
+                wi.WeaponEntity = entity;
+                wi.FirstPersonEntity = firstPersonWeapon;
+                wi.ThirdPersonEntity = thirdPersonWeapon;
+
+                OnEquip(cWeapon, wi);
+            }
+        }
+
         auto weapon = getActiveWeapon(entity);
         if (!weapon) {
             return;
@@ -94,6 +110,64 @@ protected:
         }
     }
 
+    void playAnimation(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+    }
+
+    void playAnimationAndReturn(EntityWrapper weaponModelEntity, const std::string& subTreeName, const std::string& animationNodeName)
+    {
+        EntityWrapper root = weaponModelEntity.FirstParentWithComponent("Model");
+        if (!root.Valid()) {
+            return;
+        }
+
+        EntityWrapper subTree = root.FirstChildByName(subTreeName);
+        if (!subTree.Valid()) {
+            return;
+        }
+
+        EntityWrapper animationNode = subTree.FirstChildByName(animationNodeName);
+        if (!animationNode.Valid()) {
+            return;
+        }
+
+        Events::AutoAnimationBlend eFireBlend;
+        eFireBlend.RootNode = root;
+        eFireBlend.NodeName = animationNodeName;
+        eFireBlend.Restart = true;
+        eFireBlend.Start = true;
+        m_EventBroker->Publish(eFireBlend);
+
+        Events::AutoAnimationBlend eIdleBlend;
+        eIdleBlend.RootNode = root;
+        eIdleBlend.NodeName = "Idle";
+        eIdleBlend.AnimationEntity = animationNode;
+        eIdleBlend.Delay = -0.2;
+        eIdleBlend.Duration = 0.2;
+        m_EventBroker->Publish(eIdleBlend);
+    }
+
 private:
     EventRelay<ETYPE, Events::SetCamera> m_ESetCamera;
     bool _OnSetCamera(const Events::SetCamera& e)
@@ -180,6 +254,10 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
+        if (!IsServer) {
+            return;
+        }
+
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
             return;
@@ -209,9 +287,11 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        if (firstPersonAttachment.Valid()) {
-            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
-        }
+        //if (IsClient) {
+            if (firstPersonAttachment.Valid()) {
+                firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+            }
+        //}
         if (thirdPersonAttachment.Valid()) {
             thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
         }

resources/DefaultConfig.ini

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

resources/DefaultInput.ini

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

resources/Schema/Components.xsd

@@ -63,4 +63,6 @@
 	<xs:include schemaLocation="Components/FloatingEffect.xsd"/>
 	<xs:include schemaLocation="Components/BoostIconsHUD.xsd"/>
 	<xs:include schemaLocation="Components/InputCmdButton.xsd"/>
+	<xs:include schemaLocation="Components/ScoreScreen.xsd"/>
+	<xs:include schemaLocation="Components/ScoreIdentity.xsd"/>
 </xs:schema>

resources/Schema/Components/AssaultWeapon.xml

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

resources/Schema/Components/AssaultWeapon.xsd

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

resources/Schema/Components/ScoreIdentity.xml

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

resources/Schema/Components/ScoreIdentity.xsd

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="ScoreIdentity">
+		<xs:annotation><xs:documentation>A component tracking data for the score of a player.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Name" type="t:string" minOccurs="0">
+				<xs:annotation><xs:documentation>A name for tracking score identities, this should be unique.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ID" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>An id for tracking identities</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="KD" type="t:double" minOccurs="0">
+				<xs:annotation><xs:documentation>The Kills per death score.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Kills" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of kills.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Deaths" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>The amount of deaths.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Ping" type="t:int" minOccurs="0">
+				<xs:annotation><xs:documentation>Ping of a player.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Connected" type="t:bool" minOccurs="0">
+				<xs:annotation><xs:documentation>If the player is currently connected or not</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ScoreScreen.xml

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

resources/Schema/Components/ScoreScreen.xsd

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
+	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
+	<xs:element name="ScoreScreen">
+		<xs:annotation><xs:documentation>The screen where player scores will be shown.</xs:documentation></xs:annotation>
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>The amount of score identities this scoreboard hold</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="NextPosition" type="t:int" minOccurs="0">
+					<xs:annotation><xs:documentation>Where the next scoreIdentity should be placed.</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="Offset" type="t:Vector" minOccurs="0">
+					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
+				</xs:element>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ShieldAbility.xml

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

resources/Schema/Components/ShieldAbility.xsd

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

resources/Schema/Components/SprintAbility.xml

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

resources/Schema/Components/SprintAbility.xsd

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

resources/Schema/Entities/AmmoPickupWithModel.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-4.20782185" Y="7.18348074" Z="-51.9578781"/>
+      <Scale X="0.5" Y="0.5" Z="0.5"/>
+      <Orientation X="0" Y="0.324000001" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AmmoPickup/>
+        <c:Model>
+          <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+        </c:Model>
+        <c:RaptorCopter>
+          <Speed>8</Speed>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="2.36784196" Z="0"/>
+          <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
+          <Orientation X="0" Y="72.7095108" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlendTreeAim.xml

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

resources/Schema/Entities/BlendTreeAssault.xml

@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="BlendTreeAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendOverride>
+      <Master>ReloadSwitchBlend</Master>
+      <Slave>MovementBlend</Slave>
+    </c:BlendOverride>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="MovementBlend">
+      <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.86105870560012221</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Right">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchStrafeRightF</AnimationName>
+                              <Time>0.78838016755090479</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Walk">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchWalkF</AnimationName>
+                          <Time>0.56675415272830776</Time>
+                          <Speed>1</Speed>
+                          <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>
+                      <Speed>1</Speed>
+                    </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>2.4565650245976452e-16</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="RunWalkBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Walk</Pose1>
+                          <Pose2>Run</Pose2>
+                          <Weight>1.2938206818383024e-24</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>WalkF</AnimationName>
+                              <Time>0.071908782138081051</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Run">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>RunF</AnimationName>
+                              <Time>0.34392228616198395</Time>
+                              <Speed>1</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.25350140317161873</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.27701693305173336</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                      <Time>0.07079692416292005</Time>
+                      <Speed>1</Speed>
+                      <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>
+                  <Speed>1</Speed>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="DashBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>DashFBBlend</Pose1>
+                  <Pose2>DashLRBlend</Pose2>
+                  <Weight>0.014621149736541383</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="DashFBBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DashForward</Pose1>
+                      <Pose2>DashBackward</Pose2>
+                      <Weight>0.014363533804961248</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DashForward">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>DashForwardF</AnimationName>
+                          <Time>1</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="DashBackward">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>DashBackwardF</AnimationName>
+                          <Time>1</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="DashLRBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DashLeft</Pose1>
+                      <Pose2>DashRight</Pose2>
+                      <Weight>4.3244885367500671e-16</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DashLeft">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>DashLeftF</AnimationName>
+                          <Time>1</Time>
+                          <Speed>1</Speed>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="DashRight">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>DashRightF</AnimationName>
+                          <Time>1</Time>
+                          <Speed>1</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>
+              <Speed>1</Speed>
+            </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.4961314671805894</Time>
+                      <Speed>1</Speed>
+                      <Play>true</Play>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="IdleSecondary">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleSecWepU</AnimationName>
+                      <Time>1.4996565074703767</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">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShootFastRifleU</AnimationName>
+                      <Time>0.12914212153428517</Time>
+                      <Speed>1</Speed>
+                    </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>

resources/Schema/Entities/BlendTreeAssaultWeapon.xml

@@ -0,0 +1,65 @@
+<?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">
+
+  <Components>
+    <c:Blend>
+      <Pose1>Idle</Pose1>
+      <Pose2>WeaponAction</Pose2>
+      <Weight>0</Weight>
+      <SubTreeRoot>true</SubTreeRoot>
+    </c:Blend>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="WeaponAction">
+      <Components>
+        <c:Blend>
+          <Pose1>Fire</Pose1>
+          <Pose2>Reload</Pose2>
+          <Weight>1</Weight>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="Fire">
+          <Components>
+            <c:Animation>
+              <AnimationName>ShootShotgunF</AnimationName>
+              <Speed>1</Speed>
+              <Play>true</Play>
+              <Loop>false</Loop>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Reload">
+          <Components>
+            <c:Animation>
+              <AnimationName>ReloadSwitchF</AnimationName>
+              <Time>0.58991607886241582</Time>
+              <Speed>1</Speed>
+              <Play>true</Play>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Idle">
+      <Components>
+        <c:Animation>
+          <AnimationName>IdleF</AnimationName>
+          <Time>0.14837891922093149</Time>
+          <Speed>1</Speed>
+          <Play>true</Play>
+        </c:Animation>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlendTreeSidearmWeapon.xml

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

@@ -2,36 +2,36 @@
 <Entity name="Shield" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:Blend>
+      <Pose1>Deploy</Pose1>
+      <Pose2>Idle</Pose2>
+      <Weight>0</Weight>
+    </c:Blend>
+    <c:Model>
+      <Resource>Models/Characters/Defender/DefenderShield.mesh</Resource>
+    </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="Shield">
+    <Entity name="Deploy">
       <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitPlane.mesh</Resource>
-        </c:Model>
-        <c:Shield/>
-        <c:Transform>
-          <Scale X="1.11800003" Y="0.0320000015" Z="1.9180001"/>
-          <Orientation X="-1.57079995" Y="0" Z="0"/>
-        </c:Transform>
+        <c:Animation>
+          <AnimationName>ActivateDeactiveShieldF</AnimationName>
+          <Time>1</Time>
+          <Speed>1</Speed>
+        </c:Animation>
+        <c:Transform/>
       </Components>
       <Children/>
     </Entity>
-    <Entity name="VisibleSide">
+    <Entity name="Idle">
       <Components>
-        <c:Shielded/>
-        <c:Model>
-          <Resource>Models/Core/UnitHexagon.mesh</Resource>
-          <Color A="0" B="1" G="0" R="0"/>
-          <Transparent>true</Transparent>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0" Z="0.0179871861"/>
-          <Scale X="1.01900005" Y="0.0120000001" Z="1.91000009"/>
-          <Orientation X="-1.57079995" Y="0" Z="0"/>
-        </c:Transform>
+        <c:Animation>
+          <AnimationName>ShieldFrontF</AnimationName>
+          <Speed>1</Speed>
+        </c:Animation>
+        <c:Transform/>
       </Components>
       <Children/>
     </Entity>

resources/Schema/Entities/HealthHUDAssault.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <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.588235319" 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.588235319" 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.588235319" 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 name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthHUDDefender.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDDefender" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <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.588235319" 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.588235319" 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.588235319" 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/SheildDots-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.0400000028" Y="0.0400000028" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthHUDSniper.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HealthHUDSniper" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <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.588235319" 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.588235319" 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.588235319" 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/Dash-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.0400000028" Y="0.0400000028" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="Cooldown">
+          <Components>
+            <c:Text>
+              <Content>0.0</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="1" B="0" G="0" R="0"/>
+              <Visible>false</Visible>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+              <Orientation X="0" Y="0" Z="1.57099998"/>
+              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/HealthPickupWithModel.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Collidable/>
+    <c:Model>
+      <Resource>Models/Props/PickUps/PickUpHolder.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="-7.1308527" Y="7.18348074" Z="-50.9762192"/>
+      <Scale X="0.5" Y="0.5" Z="0.5"/>
+      <Orientation X="0" Y="0.324000001" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:HealthPickup/>
+        <c:Model>
+          <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
+        </c:Model>
+        <c:RaptorCopter>
+          <Speed>8</Speed>
+          <Axis X="0" Y="0.100000001" Z="0"/>
+        </c:RaptorCopter>
+        <c:Transform>
+          <Position X="0" Y="2.36784196" Z="0"/>
+          <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
+          <Orientation X="0" Y="40.1343727" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/MovementTest.xml

@@ -8,15 +8,15 @@
   <Children>
     <Entity name="RedSpawn">
       <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/PlayerRed.xml</EntityFile>
-        </c:Spawner>
         <c:Team>
           <Team>
             <Red/>
           </Team>
         </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/PlayerDefenderBlue.xml</EntityFile>
+        </c:Spawner>
         <c:Transform>
           <Position X="0.300000012" Y="0.0270000007" Z="0"/>
         </c:Transform>
@@ -76,15 +76,15 @@
     </Entity>
     <Entity name="BlueSpawn">
       <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/PlayerAssaultBlue.xml</EntityFile>
+        </c:Spawner>
         <c:Transform>
           <Position X="0.300000012" Y="0.0270000007" Z="6.67400026"/>
         </c:Transform>

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,90 +600,99 @@
                     </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/>
+                  <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>
-                <Entity name="SniperClassPick">
+                <Entity name="ToClassPick">
                   <Components>
                     <c:Button/>
                     <c:Sprite>
-                      <DiffuseTexture>Textures/Test/aM4ME4GR.png</DiffuseTexture>
+                      <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>3</PressValue>
+                      <Command>SwapToClassPick</Command>
+                      <PressValue>1</PressValue>
                     </c:InputCmdButton>
                     <c:Transform>
-                      <Position X="0.349999994" Y="-0.0500000007" Z="0"/>
+                      <Position X="0.349999994" Y="-0.0800000057" Z="0"/>
                       <Scale X="0.0799999982" Y="0.0799999982" Z="1"/>
                     </c:Transform>
                   </Components>
-                  <Children/>
+                  <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>

resources/Schema/Entities/Player.xml

@@ -6,11 +6,12 @@
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
-    <c:AssaultWeapon>
-      <Slot>
-        <Secondary/>
-      </Slot>
-    </c:AssaultWeapon>
+    <c:AssaultWeapon/>
+    <c:Team>
+      <Team>
+        <Blue/>
+      </Team>
+    </c:Team>
     <c:Collidable/>
     <c:DashAbility/>
     <c:DoubleJump/>
@@ -22,11 +23,6 @@
       <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>
@@ -173,6 +169,40 @@
                         </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">
@@ -219,12 +249,12 @@
                   <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>
@@ -253,12 +283,12 @@
                   <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>
@@ -287,13 +317,13 @@
                   <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>
@@ -322,12 +352,12 @@
                   <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>
@@ -356,11 +386,11 @@
                   <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>
@@ -433,15 +463,15 @@
             </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"/>
@@ -454,16 +484,14 @@
         </Entity>
         <Entity name="Hands">
           <Components>
-            <c:Animation>
-              <AnimationName1>Idle</AnimationName1>
-              <Time1>1.8348644854054612</Time1>
-              <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
-            </c:Animation>
+            <c:Blend>
+              <Pose1>BlendTreeAssaultWeapon</Pose1>
+              <Pose2>BlendTreeSecondaryWeapon</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
             <c:Model>
-              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.309803933" R="0"/>
+              <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -477,11 +505,11 @@
                   <Weapon>AssaultWeapon</Weapon>
                 </c:WeaponAttachment>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
+                  <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"/>
+                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
+                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -498,12 +526,79 @@
                   <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"/>
+                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
+                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity name="BlendTreeAssaultWeapon">
+              <Components>
+                <c:Blend>
+                  <Pose1>Idle</Pose1>
+                  <Pose2>WeaponAction</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponAction">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Fire</Pose1>
+                      <Pose2>Reload</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Fire">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ShootShotgunF</AnimationName>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                          <Loop>false</Loop>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="Reload">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ReloadSwitchF</AnimationName>
+                          <Time>0.58991607886241582</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Idle">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>IdleF</AnimationName>
+                      <Time>0.14837891922093149</Time>
+                      <Speed>1</Speed>
+                      <Play>true</Play>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="BlendTreeSecondaryWeapon">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
           </Children>
         </Entity>
       </Children>
@@ -527,16 +622,10 @@
     </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:BlendAdditive>
+          <Adder>BlendTreeAim</Adder>
+          <Receiver>BlendTreeAssault</Receiver>
+        </c:BlendAdditive>
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
@@ -548,6 +637,9 @@
       <Children>
         <Entity name="PrimaryAttachment">
           <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
               <Person>
@@ -555,9 +647,12 @@
               </Person>
             </c:WeaponAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
+              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
             </c:Spawner>
-            <c:Transform/>
+            <c:Transform>
+              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
+              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
+            </c:Transform>
           </Components>
           <Children/>
         </Entity>
@@ -576,12 +671,490 @@
               <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"/>
+              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
+              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
             </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.5</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.5</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.86105870560012221</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="Right">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>CrouchStrafeRightF</AnimationName>
+                                      <Time>0.78838016755090479</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="Walk">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchWalkF</AnimationName>
+                                  <Time>0.56675415272830776</Time>
+                                  <Speed>1</Speed>
+                                  <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>
+                              <Speed>1</Speed>
+                            </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>2.4565650245976452e-16</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="RunWalkBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>Walk</Pose1>
+                                  <Pose2>Run</Pose2>
+                                  <Weight>1.2938206818383024e-24</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="Walk">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>WalkF</AnimationName>
+                                      <Time>0.071908782138081051</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="Run">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>RunF</AnimationName>
+                                      <Time>0.34392228616198395</Time>
+                                      <Speed>1</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="Right">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>StrafeRightF</AnimationName>
+                                      <Time>0.27701693305173336</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="Left">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>StrafeLeftF</AnimationName>
+                                      <Time>0.25350140317161873</Time>
+                                      <Speed>1</Speed>
+                                      <Play>true</Play>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Idle">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>IdleF</AnimationName>
+                              <Time>0.07079692416292005</Time>
+                              <Speed>1</Speed>
+                              <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>
+                          <Speed>1</Speed>
+                          <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>
+                      <Speed>1</Speed>
+                    </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.4961314671805894</Time>
+                              <Speed>1</Speed>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="IdleSecondary">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>IdleSecWepU</AnimationName>
+                              <Time>1.4996565074703767</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">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ShootFastRifleU</AnimationName>
+                              <Time>0.12914212153428517</Time>
+                              <Speed>1</Speed>
+                            </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>
     <Entity name="AABBStanding">

resources/Schema/Entities/PlayerAssaultFallbackBlue.xml

@@ -169,6 +169,40 @@
                         </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">
@@ -459,7 +493,7 @@
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.309803933" R="0"/>
+              <Color A="1" B="1" G="0.294117659" R="0"/>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -473,7 +507,7 @@
                   <Weapon>AssaultWeapon</Weapon>
                 </c:WeaponAttachment>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
                   <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
@@ -554,45 +588,14 @@
               </Person>
             </c:WeaponAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
+              <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 name="AssaultWeapon">
-              <Components>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                </c:Model>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="WeaponMuzzle">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform>
-                      <Position X="0.00624208851" Y="0.0957332104" Z="-0.159257293"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="ThirdPersonReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
+          <Children/>
         </Entity>
         <Entity name="SecondaryAttachment">
           <Components>

resources/Schema/Entities/PlayerAssaultFallbackRed.xml

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

@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="HUD" 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.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="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>
+              <DepthSort>false</DepthSort>
+              <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: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"/>
+                  <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.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: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"/>
+                  <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>
+              <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>
+              <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
+            </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>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"/>
+                  <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.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: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"/>
+                  <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: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.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/PlayerModel.xml

@@ -1,36 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Assault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="PlayerModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
     <c:BlendAdditive>
-      <Adder>AimBlend</Adder>
-      <Receiver>FinalBlend</Receiver>
+      <Adder>BlendTreeAim</Adder>
+      <Receiver>BlendTreeAssault</Receiver>
     </c:BlendAdditive>
+    <c:Shielded/>
+    <c:HiddenForLocalPlayer/>
     <c:Model>
-      <GlowIntensity>5</GlowIntensity>
       <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+      <Color A="1" B="1" G="0.25" R="0"/>
+      <Visible>false</Visible>
     </c:Model>
     <c:Transform/>
   </Components>
 
   <Children>
-    <Entity name="WeaponAttachment">
+    <Entity name="PrimaryAttachment">
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Arm_Weapon_Joint</BoneName>
         </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-        </c:Model>
+        <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.156333789" Y="1.03861308" Z="-0.236426264"/>
-          <Orientation X="-0.004295466" Y="-0.0313791931" Z="0.138012439"/>
-          <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+          <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="AimBlend">
+    <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.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">
       <Components>
         <c:Blend>
           <Pose1>AimPrimary</Pose1>
@@ -45,7 +74,7 @@
           <Components>
             <c:Animation>
               <AnimationName>AimSecWepA</AnimationName>
-              <Time>0.5</Time>
+              <Time>0.71143966913223267</Time>
               <Loop>false</Loop>
               <Additive>true</Additive>
             </c:Animation>
@@ -57,7 +86,7 @@
           <Components>
             <c:Animation>
               <AnimationName>AimRifleA</AnimationName>
-              <Time>0.5</Time>
+              <Time>0.71143966913223267</Time>
               <Loop>false</Loop>
               <Additive>true</Additive>
             </c:Animation>
@@ -67,16 +96,16 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="FinalBlend">
+    <Entity name="BlendTreeAssault">
       <Components>
         <c:BlendOverride>
           <Master>ReloadSwitchBlend</Master>
-          <Slave>MovementBlend</Slave>
+          <Slave>FinalMovementBlend</Slave>
         </c:BlendOverride>
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="MovementBlend">
+        <Entity name="FinalMovementBlend">
           <Components>
             <c:Blend>
               <Pose1>StandCrouchBlend</Pose1>
@@ -92,12 +121,95 @@
                 <c:Blend>
                   <Pose1>StandMovement</Pose1>
                   <Pose2>CrouchMovement</Pose2>
-                  <Weight>0.012867419418159054</Weight>
+                  <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.93215091236880454</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeRightF</AnimationName>
+                                  <Time>0.85947237431958712</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchWalkF</AnimationName>
+                              <Time>0.63784635949699009</Time>
+                              <Speed>1</Speed>
+                              <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>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
                 <Entity name="StandMovement">
                   <Components>
                     <c:Blend>
@@ -132,7 +244,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                  <Time>0.2564968854355536</Time>
+                                  <Time>0.14300098890676338</Time>
                                   <Speed>1</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -144,7 +256,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                  <Time>0.52851038945945739</Time>
+                                  <Time>0.41501449293066628</Time>
                                   <Speed>1</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -168,7 +280,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.43808950646909217</Time>
+                                  <Time>0.32459360994030106</Time>
                                   <Speed>1</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -180,7 +292,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.4616050363492068</Time>
+                                  <Time>0.34810913982041569</Time>
                                   <Speed>1</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -196,7 +308,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                          <Time>0.0053995709937186831</Time>
+                          <Time>1.2585556863362655</Time>
                           <Speed>1</Speed>
                           <Play>true</Play>
                         </c:Animation>
@@ -206,89 +318,6 @@
                     </Entity>
                   </Children>
                 </Entity>
-                <Entity name="CrouchMovement">
-                  <Components>
-                    <c:Blend>
-                      <Pose1>MovementBlend</Pose1>
-                      <Pose2>Idle</Pose2>
-                      <Weight>0</Weight>
-                    </c:Blend>
-                    <c:Transform/>
-                  </Components>
-                  <Children>
-                    <Entity name="MovementBlend">
-                      <Components>
-                        <c:Blend>
-                          <Pose1>Walk</Pose1>
-                          <Pose2>StrafeLRBlend</Pose2>
-                          <Weight>2.4565650245976452e-16</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.045646808897594759</Time>
-                                  <Speed>1</Speed>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="Right">
-                              <Components>
-                                <c:Animation>
-                                  <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.97296827084837822</Time>
-                                  <Speed>1</Speed>
-                                  <Play>true</Play>
-                                </c:Animation>
-                                <c:Transform/>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
-                        <Entity name="Walk">
-                          <Components>
-                            <c:Animation>
-                              <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.75134225602578031</Time>
-                              <Speed>1</Speed>
-                              <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>
-                          <Speed>1</Speed>
-                        </c:Animation>
-                        <c:Transform/>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
               </Children>
             </Entity>
             <Entity name="JumpDashBlend">
@@ -339,7 +368,7 @@
                             <c:Animation>
                               <AnimationName>DashForwardF</AnimationName>
                               <Time>1</Time>
-                              <Speed>1</Speed>
+                              <Speed>2</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -351,7 +380,7 @@
                             <c:Animation>
                               <AnimationName>DashBackwardF</AnimationName>
                               <Time>1</Time>
-                              <Speed>1</Speed>
+                              <Speed>2</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -375,7 +404,7 @@
                             <c:Animation>
                               <AnimationName>DashLeftF</AnimationName>
                               <Time>1</Time>
-                              <Speed>1</Speed>
+                              <Speed>2</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -387,7 +416,7 @@
                             <c:Animation>
                               <AnimationName>DashRightF</AnimationName>
                               <Time>1</Time>
-                              <Speed>1</Speed>
+                              <Speed>2</Speed>
                               <Loop>false</Loop>
                             </c:Animation>
                             <c:Transform/>
@@ -448,7 +477,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleAssaultRifleU</AnimationName>
-                          <Time>0.68071957047806109</Time>
+                          <Time>0.56722367394927176</Time>
                           <Speed>1</Speed>
                           <Play>true</Play>
                         </c:Animation>
@@ -460,7 +489,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleSecWepU</AnimationName>
-                          <Time>0.68424461076784837</Time>
+                          <Time>0.57074871423905904</Time>
                           <Speed>1</Speed>
                           <Play>true</Play>
                         </c:Animation>

resources/Schema/Entities/RayBlue.xml

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

resources/Schema/Entities/RayRed.xml

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

resources/Schema/Entities/ScoreBoard.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoardOrigin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="66.4319992" Y="37.9560013" Z="0"/>
+      <Orientation X="0" Y="4.71199989" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Background_Main">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Scale X="60" Y="30" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="BlueSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="0.505882382" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="16" Y="0" Z="0.5"/>
+          <Scale X="25" Y="28" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="RedSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="0" G="0.219607845" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-16" Y="0" Z="0.5"/>
+          <Scale X="25" Y="28" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Background_Spectator">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-20.5" Z="0"/>
+          <Scale X="20" Y="10" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Blue">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-2" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="16" Y="12" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Red">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-2" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="-16" Y="12" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Spectators">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-1" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team/>
+        <c:Transform>
+          <Position X="0" Y="-17.5" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Blue.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Blue_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="BlueSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="1" G="0.505882382" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.5"/>
+          <Scale X="32" Y="23" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Blue">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-3" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="7" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="IDText">
+          <Components>
+            <c:Text>
+              <Content>ID</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-13" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="NameText">
+          <Components>
+            <c:Text>
+              <Content>Name</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-10" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KDText">
+          <Components>
+            <c:Text>
+              <Content>KD</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="1.28838646" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillsText">
+          <Components>
+            <c:Text>
+              <Content>Kills</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="4.6874299" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="DeathsText">
+          <Components>
+            <c:Text>
+              <Content>Deaths</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="8.9577198" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Main.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Main_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="Background_Spectator">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="-19" Z="0"/>
+          <Scale X="30" Y="12" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Spectators">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-2" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team/>
+        <c:Transform>
+          <Position X="0" Y="-15.7886772" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Background_Main">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Scale X="69" Y="25" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawner_1">
+      <Components>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="16.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawner_2">
+      <Components>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="-16.5" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreBoard_Red.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreBoard_Red_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="RedSide">
+      <Components>
+        <c:Model>
+          <Resource>Models/Core/UnitCube.mesh</Resource>
+          <Color A="1" B="0" G="0.0862745121" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="0" Z="0.5"/>
+          <Scale X="32" Y="23" Z="1"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="ScoreBoard_Red">
+      <Components>
+        <c:ScoreScreen>
+          <Offset X="0" Y="-3" Z="0"/>
+        </c:ScoreScreen>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="7" Z="1.5"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="IDText">
+          <Components>
+            <c:Text>
+              <Content>ID</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-13" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="NameText">
+          <Components>
+            <c:Text>
+              <Content>Name</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="-10" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KDText">
+          <Components>
+            <c:Text>
+              <Content>KD</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="1.28838646" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillsText">
+          <Components>
+            <c:Text>
+              <Content>Kills</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="4.6874299" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="DeathsText">
+          <Components>
+            <c:Text>
+              <Content>Deaths</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Left/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="8.9577198" Y="2.5" Z="0"/>
+              <Scale X="2" Y="2" Z="2"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/ScoreIdentity.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="ScoreIdentity" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:ScoreIdentity>
+      <Name></Name>
+    </c:ScoreIdentity>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="ID">
+      <Components>
+        <c:Text>
+          <Content>-1</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>ID</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="-13" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Name">
+      <Components>
+        <c:Text>
+          <Content></Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Name</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="-10" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="KD">
+      <Components>
+        <c:Text>
+          <Content>0.0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>KD</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="1.28572214" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Kills">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Kills</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="6" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Deaths">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+          <Alignment>
+            <Left/>
+          </Alignment>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Deaths</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="10" Y="0" Z="0"/>
+          <Scale X="2" Y="2" Z="2"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/Spawnpoint

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="BluSpawn" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:PlayerSpawn/>
-    <c:Model>
-      <Resource>Models/Core/UnitCube.mesh</Resource>
-    </c:Model>
-    <c:Spawner>
-      <EntityFile>Schema/Entities/Player.xml</EntityFile>
-    </c:Spawner>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
-    <c:Transform>
-      <Position X="57.7363472" Y="1.18853188" Z="79.5"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:SpawnPoint/>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/SprintEffect.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="SprintEffect" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Animation>
+      <AnimationName1></AnimationName1>
+      <AnimationName2></AnimationName2>
+      <AnimationName3></AnimationName3>
+    </c:Animation>
+    <c:Lifetime>
+      <Lifetime>0.15</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <Velocity X="0" Y="0" Z="0"/>
+      <ExplosionDuration>0.15</ExplosionDuration>
+    </c:ExplosionEffect>
+    <c:Model>
+      <Resource></Resource>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/Testingu

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity>
-      <Components>
-        <c:Model>
-          <Resource>Models/Core/UnitPlane.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Scale X="10" Y="10" Z="10"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:PlayerSpawn/>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Player.xml</EntityFile>
-        </c:Spawner>
-        <c:Team>
-          <Team>
-            <Red/>
-          </Team>
-        </c:Team>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:SpawnPoint/>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/WeaponAssaultBlueView.xml

@@ -98,6 +98,12 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="ReloadEffect">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponAssaultRedView.xml

@@ -1,17 +1,11 @@
 <?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="AssaultWeapon" 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>
-      <PositionOffset X="0" Y="0.0480000004" Z="-0.183000013"/>
-    </c:BoneAttachment>
     <c:Model>
-      <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
+      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -21,7 +15,8 @@
           <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
         </c:Spawner>
         <c:Transform>
-          <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
+          <Position X="0.00800000038" Y="0.0920000076" Z="-0.416000009"/>
+          <Orientation X="6.2760005" Y="0.00500000035" Z="0.00600000005"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -37,9 +32,8 @@
     </Entity>
     <Entity name="AmmunitionHUD">
       <Components>
-        <c:AmmunitionHUD/>
         <c:Transform>
-          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
+          <Position X="-0.0440000035" Y="0.136000007" Z="-0.119000003"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
       </Components>
@@ -70,6 +64,11 @@
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>Player</ParentEntityName>
+                  <ComponentType>AssaultWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
                 <c:Transform>
                   <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
                 </c:Transform>
@@ -79,10 +78,15 @@
             <Entity name="Ammo">
               <Components>
                 <c:Text>
-                  <Content>360</Content>
+                  <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>Player</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"/>
@@ -94,6 +98,12 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="ReloadEffect">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponAssaultRedWorld.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="ThirdPersonWeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+<Entity name="AssaultWeapon" 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>
-      <PositionOffset X="0" Y="0.0320000015" Z="-0.165000007"/>
-    </c:BoneAttachment>
     <c:Model>
-      <Resource>Models/Weapons/Red/DefenderGunRed.mesh</Resource>
+      <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0.162026152" Y="1.05794585" Z="-0.380744517"/>
-      <Orientation X="-0.0628969446" Y="-0.0509683639" Z="0.118739031"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -22,7 +15,7 @@
           <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
         </c:Spawner>
         <c:Transform>
-          <Position X="0.000284185546" Y="0.0318552479" Z="-0.193328083"/>
+          <Position X="0.00644115033" Y="0.096679531" Z="-0.436609417"/>
         </c:Transform>
       </Components>
       <Children/>

resources/Schema/Entities/WeaponDefenderBlueView.xml

@@ -3,11 +3,9 @@
 
   <Components>
     <c:Model>
-      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
+      <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0" Y="0.0350000001" Z="-0.295000017"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>
@@ -34,7 +32,7 @@
     <Entity name="AmmunitionHUD">
       <Components>
         <c:Transform>
-          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
+          <Position X="-0.0460000038" Y="0.119000003" Z="-0.162"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
       </Components>
@@ -60,16 +58,16 @@
           <Children>
             <Entity name="MagazineAmmo">
               <Components>
+                <c:Text>
+                  <Content>8</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
                 <c:TextFieldReader>
                   <ParentEntityName>Player</ParentEntityName>
                   <ComponentType>DefenderWeapon</ComponentType>
                   <Field>MagazineAmmo</Field>
                 </c:TextFieldReader>
-                <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>
@@ -78,16 +76,16 @@
             </Entity>
             <Entity name="Ammo">
               <Components>
+                <c:Text>
+                  <Content>64</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
+                </c:Text>
                 <c:TextFieldReader>
                   <ParentEntityName>Player</ParentEntityName>
                   <ComponentType>DefenderWeapon</ComponentType>
                   <Field>Ammo</Field>
                 </c:TextFieldReader>
-                <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>
                   <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
                   <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>

resources/Schema/Entities/WeaponDefenderBlueWorld.xml

@@ -2,17 +2,10 @@
 <Entity name="ThirdPersonWeaponModel" 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>
-      <PositionOffset X="0" Y="0.0320000015" Z="-0.165000007"/>
-    </c:BoneAttachment>
     <c:Model>
-      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
+      <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
     </c:Model>
-    <c:Transform>
-      <Position X="0.162026152" Y="1.05794585" Z="-0.380744517"/>
-      <Orientation X="-0.0628969446" Y="-0.0509683639" Z="0.118739031"/>
-    </c:Transform>
+    <c:Transform/>
   </Components>
 
   <Children>

resources/Schema/Entities/aim_rays.xml

@@ -92,15 +92,15 @@
     </Entity>
     <Entity>
       <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/>
       </Components>
       <Children>
@@ -143,15 +143,15 @@
     </Entity>
     <Entity>
       <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/>
       </Components>
       <Children>
@@ -209,24 +209,26 @@
       <Components>
         <c:AABB/>
         <c:CapturePoint>
+          <CaptureTimer>-15</CaptureTimer>
           <HomePointForTeam>
             <Blue/>
           </HomePointForTeam>
         </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="0.200000003" R="0"/>
-        </c:Model>
         <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:Transform>
           <Position X="0" Y="0.773066521" Z="-18.975975"/>
           <Scale X="4.9000001" Y="0.600000024" Z="3.50000024"/>
         </c:Transform>
-        <c:Trigger/>
       </Components>
       <Children/>
     </Entity>
@@ -234,25 +236,27 @@
       <Components>
         <c:AABB/>
         <c:CapturePoint>
+          <CaptureTimer>15</CaptureTimer>
           <HomePointForTeam>
             <Red/>
           </HomePointForTeam>
           <CapturePointNumber>1</CapturePointNumber>
         </c:CapturePoint>
-        <c:Model>
-          <Resource>Models\Core\UnitCube.mesh</Resource>
-          <Color A="1" B="1" G="1" R="0"/>
-        </c:Model>
         <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:Transform>
           <Position X="0" Y="0.452868998" Z="18.5607414"/>
           <Scale X="4.60000038" Y="0.900000036" Z="4.10000038"/>
         </c:Transform>
-        <c:Trigger/>
       </Components>
       <Children/>
     </Entity>

resources/Schema/Entities/aim_rays_with_capturep.xml

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0.980392158" G="1" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.100000001" Y="0" Z="0"/>
+          <Scale X="50" Y="1" Z="51.1000023"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:DirectionalLight/>
+        <c:Transform>
+          <Orientation X="4.38500023" Y="0" Z="0.458000034"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="0" G="0" R="1"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Collidable/>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="1" G="0" R="0"/>
+        </c:Model>
+        <c:Transform>
+          <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
+          <Scale X="14.4000006" Y="5.30000019" Z="4.5"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-20.6000004" Y="1" Z="21.7150002"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PlayerSpawn/>
+            <c:Transform>
+              <Position X="-12.2000008" Y="1" Z="21.5000019"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:Transform>
+              <Position X="15.4000006" Y="1" Z="21.6000004"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="10.500001" Y="0" Z="21.9000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:PlayerSpawn/>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/Player.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-9.70000076" Y="1" Z="-23.4000015"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="-18.8000011" Y="1" Z="-22.3000011"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="8.10000038" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:SpawnPoint/>
+            <c:Transform>
+              <Position X="16.2000008" Y="1" Z="-23.2000008"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>models/core/unitcube.mesh</Resource>
+          <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
+        </c:Model>
+        <c:Transform>
+          <Scale X="-70" Y="-70" Z="-70"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="-">
+          <Components>
+            <c:AABB/>
+            <c:CapturePoint>
+              <CaptureTimer>15</CaptureTimer>
+              <HomePointForTeam>
+                <Red/>
+              </HomePointForTeam>
+            </c:CapturePoint>
+            <c:Team>
+              <Team>
+                <Red/>
+              </Team>
+            </c:Team>
+            <c:Trigger/>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-4.10000038"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Red">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="2.70000005" Y="3.4000001" Z="4.60000038"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Blue">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="3.4000001" Y="4.70000029" Z="0.700000048"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Spectator">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="1" Y="5.70000029" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="-">
+          <Components>
+            <c:AABB/>
+            <c:CapturePoint>
+              <CaptureTimer>-15</CaptureTimer>
+              <HomePointForTeam>
+                <Blue/>
+              </HomePointForTeam>
+              <CapturePointNumber>1</CapturePointNumber>
+            </c:CapturePoint>
+            <c:Team>
+              <Team>
+                <Blue/>
+              </Team>
+            </c:Team>
+            <c:Trigger/>
+            <c:Transform>
+              <Position X="0" Y="0" Z="4"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Red">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="4.4000001" Y="2" Z="3.70000029"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Blue">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Orientation X="0" Y="2.95000005" Z="0"/>
+                  <Scale X="4.70000029" Y="3.60000014" Z="3.60000014"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Spectator">
+              <Components>
+                <c:Model>
+                  <Resource>models/core/unitcube.mesh</Resource>
+                </c:Model>
+                <c:Transform>
+                  <Scale X="5.50000048" Y="2.5" Z="3.80000019"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/temp

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="MagazineAmmo">
-      <Components>
-        <c:Text>
-          <Content>0</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-          <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Ammo">
-      <Components>
-        <c:Text>
-          <Content>360</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-          <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="5.2833886e-05" Y="-0.0407950208" Z="0"/>
-          <Scale X="0.0399999991" Y="0.0399999991" Z="0.0399999991"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/yeeee.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Assault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:BlendAdditive>
-      <Adder>AimAdditive</Adder>
-      <Receiver>BlendOverride</Receiver>
-    </c:BlendAdditive>
-    <c:Model>
-      <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-    </c:Model>
-    <c:Transform/>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponAttachment">
-      <Components>
-        <c:BoneAttachment>
-          <BoneName>R_Arm_Weapon_Joint</BoneName>
-        </c:BoneAttachment>
-        <c:Model>
-          <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Scale X="1.00000012" Y="1" Z="1.00000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AimAdditive">
-      <Components>
-        <c:Animation>
-          <AnimationName>AimRifleA</AnimationName>
-          <Time>1</Time>
-          <Additive>true</Additive>
-        </c:Animation>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="BlendOverride">
-      <Components>
-        <c:BlendOverride>
-          <Master>ShootRifleAnimation</Master>
-          <Slave>MovementBlend</Slave>
-        </c:BlendOverride>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="ShootRifleAnimation">
-          <Components>
-            <c:Animation>
-              <AnimationName>ShootFastRifleU</AnimationName>
-              <Time>0.11937709655124218</Time>
-              <Speed>1</Speed>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="MovementBlend">
-          <Components>
-            <c:Blend>
-              <Pose1>BlendWalkRun</Pose1>
-              <Pose2>StrafeAnimation</Pose2>
-              <Weight>1</Weight>
-            </c:Blend>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="StrafeAnimation">
-              <Components>
-                <c:Animation>
-                  <AnimationName>StrafeRightF</AnimationName>
-                  <Time>0.37772682263908042</Time>
-                  <Speed>1</Speed>
-                </c:Animation>
-                <c:Transform/>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="BlendWalkRun">
-              <Components>
-                <c:Blend>
-                  <Pose1>RunAnimtaion</Pose1>
-                  <Pose2>WalkAnimation</Pose2>
-                  <Weight>0.43000054359436035</Weight>
-                </c:Blend>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="RunAnimtaion">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>RunF</AnimationName>
-                      <Time>0.13674529278927716</Time>
-                      <Speed>1</Speed>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="WalkAnimation">
-                  <Components>
-                    <c:Animation>
-                      <AnimationName>WalkF</AnimationName>
-                      <Time>0.36615803446482609</Time>
-                      <Speed>1</Speed>
-                    </c:Animation>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -66,6 +66,8 @@
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
 							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
+							<xs:element ref="c:ScoreScreen" minOccurs="0"/>
+							<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

@@ -171,7 +171,7 @@ void main()
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
 	float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
-	vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a;
+	vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
 	color_result = color_result * clamp(1/specularTexel.a, 0, 1) + reflectionTotal;
 	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	

resources/Shaders/ForwardPlusShieldCheck.frag.glsl

@@ -178,7 +178,7 @@ void main()
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
 	color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
 	float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
-	vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a;
+	vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
 	color_result = color_result * clamp(1/specularTexel.a, 0, 1) + reflectionTotal;
 	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	

src/Engine/Editor/EditorGUI.cpp

@@ -157,7 +157,7 @@ void EditorGUI::drawEntitiesRecursive(World* world, EntityID parent)
     auto entityChildren = world->GetEntityChildren();
     auto range = entityChildren.equal_range(parent);
     for (auto it = range.first; it != range.second; it++) {
-        if (EditorGUI::drawEntityNode(EntityWrapper(world, it->second))) {
+        if (drawEntityNode(EntityWrapper(world, it->second))) {
             drawEntitiesRecursive(world, it->second);
             ImGui::TreePop();
         }
@@ -217,6 +217,7 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
         ImGui::EndPopup();
     }
 
+    ImGui::PushID(("EntityNode" + std::to_string(entity.ID)).c_str());
     ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once);
     if (ImGui::TreeNode(formatEntityName(entity).c_str())) {
         // Handle drop events for reparenting
@@ -224,8 +225,10 @@ bool EditorGUI::drawEntityNode(EntityWrapper entity)
             entityChangeParent(m_CurrentlyDragging, entity);
             m_CurrentlyDragging = EntityWrapper::Invalid;
         }
+        ImGui::PopID();
         return true;
     } else {
+        ImGui::PopID();
         return false;
     }
 }

src/Engine/Editor/EditorSystem.cpp

@@ -19,7 +19,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_ActualCamera = m_EditorCamera;
     m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Transform");
     m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Camera");
-    m_EditorCameraInputController = new EditorCameraInputController<EditorSystem>(m_EventBroker, -1);
+    m_EditorCameraInputController = new EditorCameraInputController<EditorSystem>(m_EventBroker, -1, EntityWrapper::Invalid);
 
     m_EditorGUI = new EditorGUI(m_World, m_EventBroker);
     m_EditorGUI->SetEntitySelectedCallback(std::bind(&EditorSystem::OnEntitySelected, this, std::placeholders::_1));

src/Engine/GUI/ButtonSystem.cpp

@@ -40,7 +40,7 @@ bool ButtonSystem::OnMousePress(const Events::MousePress& e)
                 //You have clicked on a button entity, send pressed event.
                 if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
                     Events::InputCommand eInputCmd;
-                    eInputCmd.PlayerID = LocalPlayer.ID;
+                    eInputCmd.PlayerID = -1;
                     eInputCmd.Player = LocalPlayer;
                     EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
                     eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];
@@ -68,7 +68,7 @@ bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
 
             if (m_World->HasComponent(m_PickData.Entity, "InputCmdButton")) {
                 Events::InputCommand eInputCmd;
-                eInputCmd.PlayerID = LocalPlayer.ID;
+                eInputCmd.PlayerID = -1;
                 eInputCmd.Player = LocalPlayer;
                 EntityWrapper button = EntityWrapper(m_World, m_PickData.Entity);
                 eInputCmd.Command = (std::string)button["InputCmdButton"]["Command"];

src/Engine/Network/Client.cpp

@@ -49,16 +49,16 @@ void Client::Connect(std::string address, int port)
 void Client::Update()
 {
     m_EventBroker->Process<Client>();
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet);
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet);
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
     while (m_Reliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);
@@ -177,8 +177,8 @@ void Client::parseTCPConnect(Packet& packet)
     Packet UnreliablePacket(MessageType::Connect, m_SendPacketID);
     // Add player id and other stuff
     packet.WritePrimitive(m_PlayerID);
-    m_Unreliable.Send(packet);
-    LOG_INFO("Sent UDP Connect Server");
+ //   m_Unreliable.Send(packet);
+  //  LOG_INFO("Sent UDP Connect Server");
 }
 
 void Client::parsePlayerConnected(Packet & packet)
@@ -476,7 +476,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
     if (e.Command == "ConnectToServer") { // Connect for now
         if (e.Value > 0) {
             m_Reliable.Connect(m_PlayerName, m_Address, m_Port);
-            m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
+        //    m_Unreliable.Connect(m_PlayerName, m_Address, m_Port);
         }
         //LOG_DEBUG("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
@@ -613,7 +613,7 @@ void Client::sendLocalPlayerTransform()
         packet.WritePrimitive((int)cAssaultWeapon["Ammo"]);
     }
 
-    m_Unreliable.Send(packet);
+    m_Reliable.Send(packet);
 }
 
 void Client::identifyPacketLoss()

src/Engine/Network/Server.cpp

@@ -14,6 +14,7 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
     EVENT_SUBSCRIBE_MEMBER(m_EComponentDeleted, &Server::OnComponentDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &Server::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_EAmmoPickup, &Server::OnAmmoPickup);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &Server::OnPlayerDeath);
     // BindWW
     if (port == 0) {
         port = config->Get<float>("Networking.Port", 27666);
@@ -46,19 +47,19 @@ void Server::Update()
         }
     }
 
-    PlayerDefinition pd;
-    while (m_Unreliable.IsSocketAvailable()) {
-        // Packet will get real data in receive
-        Packet packet(MessageType::Invalid);
-        m_Unreliable.Receive(packet, pd);
-        m_Address = pd.Endpoint.address();
-        m_Port = pd.Endpoint.port();
-        if (packet.GetMessageType() == MessageType::Connect) {
-            parseUDPConnect(packet);
-        } else {
-            parseMessageType(packet);
-        }
-    }
+    //PlayerDefinition pd;
+    //while (m_Unreliable.IsSocketAvailable()) {
+    //    // Packet will get real data in receive
+    //    Packet packet(MessageType::Invalid);
+    //    m_Unreliable.Receive(packet, pd);
+    //    m_Address = pd.Endpoint.address();
+    //    m_Port = pd.Endpoint.port();
+    //    if (packet.GetMessageType() == MessageType::Connect) {
+    //        parseUDPConnect(packet);
+    //    } else {
+    //        parseMessageType(packet);
+    //    }
+    //}
 
     while (m_ServerlistRequest.IsSocketAvailable()) {
         Packet packet(MessageType::Invalid);
@@ -161,7 +162,7 @@ void Server::unreliableBroadcast(Packet& packet)
 {
     for (auto& kv : m_ConnectedPlayers) {
         packet.ChangePacketID(kv.second.PacketID);
-        m_Unreliable.Send(packet, kv.second);
+        //        m_Unreliable.Send(packet, kv.second);
     }
 }
 
@@ -171,7 +172,7 @@ void Server::sendSnapshot()
     Packet packet(MessageType::Snapshot);
     addInputCommandsToPacket(packet);
     addPlayersToPacket(packet, EntityID_Invalid);
-    unreliableBroadcast(packet);
+    reliableBroadcast(packet);
 }
 
 void Server::addInputCommandsToPacket(Packet& packet)
@@ -319,25 +320,28 @@ void Server::checkForTimeOuts()
     }
 }
 
-void Server::parseUDPConnect(Packet & packet)
-{
-    // Pop size of message int
-    packet.ReadPrimitive<int>();
-    int messageType = packet.ReadPrimitive<int>();
-    // Read packet ID 
-    m_PreviousPacketID = m_PacketID;    // Set previous packet id
-    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
-    // parse player id and other stuff
-    PlayerID playerID = packet.ReadPrimitive<int>();
-    // Do something here?
-    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
-    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
-    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
-    // Send a message to the player that connected
-    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
-    m_Unreliable.Send(connnectPacket);
-    LOG_INFO("UDP Connect sent to client");
-}
+//void Server::parseUDPConnect(Packet & packet)
+//{
+//    // Pop size of message int
+//    packet.ReadPrimitive<int>();
+//    int messageType = packet.ReadPrimitive<int>();
+//    // Read packet ID 
+//    m_PreviousPacketID = m_PacketID;    // Set previous packet id
+//    m_PacketID = packet.ReadPrimitive<int>(); //Read new packet id
+//    // parse player id and other stuff
+//    PlayerID playerID = packet.ReadPrimitive<int>();
+//    if (!EntityWrapper(m_World, playerID).Valid()) {
+//
+//    }
+//    // Do something here?
+//    boost::asio::ip::udp::endpoint endpoint(m_Address, m_Port);
+//    m_ConnectedPlayers.at(playerID).Endpoint = endpoint;
+//    LOG_INFO("parseUDPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(), m_ConnectedPlayers.at(playerID).Endpoint.address().to_string().c_str());
+//    // Send a message to the player that connected
+//    Packet connnectPacket(MessageType::Connect, m_ConnectedPlayers.at(playerID).PacketID);
+//    m_Unreliable.Send(connnectPacket);
+//    LOG_INFO("UDP Connect sent to client");
+//}
 
 void Server::parseTCPConnect(Packet & packet)
 {
@@ -351,7 +355,7 @@ void Server::parseTCPConnect(Packet & packet)
     LOG_INFO("Parsing connections");
     // Check if player is already connected
     // Ska vara till lagd i TCPServer receive
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -363,6 +367,11 @@ void Server::parseTCPConnect(Packet & packet)
     m_ConnectedPlayers.at(playerID).TCPAddress = m_Address;
     m_ConnectedPlayers.at(playerID).TCPPort = m_Port;
 
+    Events::PlayerConnected e;
+    e.PlayerID = playerID;
+    e.PlayerName = m_ConnectedPlayers.at(playerID).Name;
+    m_EventBroker->Publish(e);
+
     LOG_INFO("parseTCPConnect: Spectator \"%s\" connected on IP: %s", m_ConnectedPlayers.at(playerID).Name.c_str(),
         m_ConnectedPlayers.at(playerID).TCPAddress.to_string().c_str());
 
@@ -526,10 +535,20 @@ bool Server::OnAmmoPickup(const Events::AmmoPickup & e)
     return true;
 }
 
+
+bool Server::OnPlayerDeath(const Events::PlayerDeath& e)
+{
+    Events::KillDeath eKD;
+    eKD.Casualty = getPlayerIDFromEntityID(e.Player.ID);
+    eKD.Killer = getPlayerIDFromEntityID(e.Killer.ID);
+    m_EventBroker->Publish(eKD);
+    return false;
+}
+
 void Server::parseClientPing()
 {
     LOG_INFO("%i: Parsing ping", m_PacketID);
-    PlayerID player = GetPlayerIDFromEndpoint();
+    PlayerID player = getPlayerIDFromEndpoint();
     if (player == -1) {
         return;
     }
@@ -567,7 +586,7 @@ void Server::parseOnInputCommand(Packet& packet)
 {
     PlayerID player = -1;
     // Check which player it was who sent the message
-    player = GetPlayerIDFromEndpoint();
+    player = getPlayerIDFromEndpoint();
     if (player != -1) {
         while (packet.DataReadSize() < packet.Size()) {
             Events::InputCommand e;
@@ -586,7 +605,7 @@ void Server::parseOnInputCommand(Packet& packet)
 
 void Server::parsePlayerTransform(Packet& packet)
 {
-    PlayerID playerID = GetPlayerIDFromEndpoint();
+    PlayerID playerID = getPlayerIDFromEndpoint();
     if (playerID == -1) {
         return;
     }
@@ -630,12 +649,17 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
             return true;
         }
     }
-    return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.HasComponent("HealthPickup")
-        || childEntity.HasComponent("AmmoPickup");
+    return childEntity.HasComponent("Player")
+        || childEntity.FirstParentWithComponent("Player").Valid()
+        || childEntity.HasComponent("CapturePoint")
+        || childEntity.HasComponent("HealthPickup")
+        || childEntity.HasComponent("AmmoPickup")
+        || childEntity.HasComponent("ScoreScreen")
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+        || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }
 
-PlayerID Server::GetPlayerIDFromEndpoint()
+PlayerID Server::getPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection
     for (auto& kv : m_ConnectedPlayers) {
@@ -647,4 +671,14 @@ PlayerID Server::GetPlayerIDFromEndpoint()
         }
     }
     return -1;
-}
+}
+
+PlayerID Server::getPlayerIDFromEntityID(EntityID entityID)
+{
+    for (auto& kv : m_ConnectedPlayers) {
+        if (entityID == kv.second.EntityID) {
+            return kv.first;
+        }
+    }
+    return -1;
+}

src/Engine/Network/TCPClient.cpp

@@ -76,7 +76,7 @@ size_t TCPClient::readBuffer()
     memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
     if (sizeOfPacket > m_Socket->available()) {
         LOG_WARNING("TCPClient::readBuffer(): We haven't got the whole packet yet.");
-        return 0;
+        //return 0;
     }
     // if the buffer is to small increase the size of it
     // TODO if message is huge 1 time the buffer will not decrease.
@@ -85,12 +85,15 @@ size_t TCPClient::readBuffer()
         m_ReadBuffer = new char[sizeOfPacket];
         m_BufferSize = sizeOfPacket;
     }
-    // Read the rest of the message
-    size_t bytesReceived = m_Socket->read_some(boost
-        ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket),
-        error);
-    if (error) {
-        //LOG_ERROR("receive: %s", error.message().c_str());
+    size_t bytesReceived = 0;
+    while (sizeOfPacket > bytesReceived) {
+        // Read the rest of the message
+        bytesReceived += m_Socket->read_some(boost
+            ::asio::buffer((void*)(m_ReadBuffer), sizeOfPacket - bytesReceived),
+            error);
+        if (error) {
+            //LOG_ERROR("receive: %s", error.message().c_str());
+        }
     }
     if (sizeOfPacket > 1000000)
         LOG_WARNING("The packets received are bigger than 1MB");

src/Engine/Network/UDPServer.cpp

@@ -21,33 +21,38 @@ void UDPServer::Send(Packet& packet, PlayerDefinition & playerDefinition)
             boost::asio::buffer(packet.Data(), packet.Size()),
             playerDefinition.Endpoint,
             0);
+        LOG_INFO("Size of packet is %i", bytesSent);
     } catch (const boost::system::system_error& e) {
+        LOG_INFO(e.what());
         // TODO: Clean up invalid endpoints out of m_ConnectedPlayers later
         playerDefinition.Endpoint = boost::asio::ip::udp::endpoint();
     }
+
 }
 // Send back to endpoint of received packet
 void UDPServer::Send(Packet & packet)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+     size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         m_ReceiverEndpoint,
         0);
+     LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting respond specific logic
 void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
 {
     packet.UpdateSize();
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),
         endpoint,
         0);
+    LOG_INFO("Size of packet is %i", bytesSent);
 }
 
 // Broadcasting
@@ -55,7 +60,7 @@ void UDPServer::Broadcast(Packet & packet, int port)
 {
     packet.UpdateSize();
     m_Socket->set_option(boost::asio::socket_base::broadcast(true));
-    m_Socket->send_to(
+    size_t bytesSent = m_Socket->send_to(
         boost::asio::buffer(
             packet.Data(),
             packet.Size()),

src/Engine/Rendering/AnimationSystem.cpp

@@ -196,7 +196,7 @@ bool AnimationSystem::OnAutoAnimationBlend(Events::AutoAnimationBlend& e)
     abj.BlendInfo.progress = 0.0;
     abj.BlendInfo.Start = e.Start;
     abj.BlendInfo.SingleBlend = e.SingleLevelBlend;
-
+    abj.BlendInfo.Weight = e.Weight;
 
     EntityWrapper nodeEntity = subTreeRoot.FirstChildByName(e.NodeName); // more than one
     if (nodeEntity.Valid()) {

src/Engine/Rendering/BlendTree.cpp

@@ -207,6 +207,22 @@ BlendTree::AutoBlendInfo BlendTree::AutoBlendStep(AutoBlendInfo blendInfo)
 {
     std::vector<Node*> goalNodes = FindNodesByName(blendInfo.NodeName);
 
+    if(blendInfo.Weight >= 0 && blendInfo.Weight <= 1.0) {
+        for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
+            EntityWrapper entity = (*it)->Entity;
+
+            if (entity.Valid()) {
+                if (entity.HasComponent("Blend")) {
+                    (double&)entity["Blend"]["Weight"] = blendInfo.Weight;
+                }
+            }
+        }
+
+        return blendInfo;
+    }
+
+
+
     if (blendInfo.Start) {
         for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
             EntityWrapper entity = (*it)->Entity;

src/Game/Game.cpp

@@ -34,6 +34,8 @@
 #include "Game/Systems/KillFeedSystem.h"
 #include "Game/Systems/BoostSystem.h"
 #include "Game/Systems/BoostIconsHUDSystem.h"
+#include "Game/Systems/ScoreScreenSystem.h"
+#include "Game/Systems/SpectatorCameraSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"
 
@@ -111,7 +113,7 @@ Game::Game(int argc, char* argv[])
 
     // Create Octrees
     // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
-    AABB boxContainingTheWorld(glm::vec3(-300), glm::vec3(300));
+    AABB boxContainingTheWorld = AABB::FromOriginSize(glm::vec3(0.f, 10.7f, 0.f), glm::vec3(140.f, 31.f, 190.f));
     m_OctreeCollision = new Octree<EntityAABB>(boxContainingTheWorld, 4);
     m_OctreeTrigger = new Octree<EntityAABB>(boxContainingTheWorld, 4);
     m_OctreeFrustrumCulling = new Octree<EntityAABB>(boxContainingTheWorld, 4);
@@ -136,25 +138,19 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AbilityCooldownHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<CapturePointArrowHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<LifetimeSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<CapturePointHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<PickupSpawnSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmoPickupSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<TextFieldReader>(updateOrderLevel);
-    m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<BoostSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<SpectatorCameraSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");

src/Game/Systems/AbilityCooldownHUDSystem.cpp

@@ -11,20 +11,72 @@ void AbilityCooldownHUDSystem::Update(double dt)
     for (auto& abilityHUDC : *abilityHUDs) {
         EntityWrapper entity = EntityWrapper(m_World, abilityHUDC.EntityID);
         EntityWrapper abilityEntity = entity.FirstParentWithComponent("DashAbility");
-        if (!abilityEntity.Valid())
-            return;
+        std::string abilityName = "";
+
+        if (!abilityEntity.Valid()) {
+            //If we dont have a dash ability on player, we check for Sprint ability
+            abilityEntity = entity.FirstParentWithComponent("SprintAbility");
+
+            if (!abilityEntity.Valid()) {
+                //If we dont have a sprint ability on player, we check for shield ability
+                abilityEntity = entity.FirstParentWithComponent("ShieldAbility");
+
+                if (!abilityEntity.Valid()) {
+                    //If we dont have a shield ability, we return, since we cannot do anything.
+                    return;
+                } else {
+                    //If we have a shield ability, we set the right icon
+                    abilityName = "ShieldAbility";
+                    if (entity.HasComponent("Sprite")) {
+                        (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\SheildDots-01.png";
+                    }
+                }
+            } else {
+                //If we do have a sprint ability, we change the icon
+                abilityName = "SprintAbility";
+                if (entity.HasComponent("Sprite")) {
+                    (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\Dash-01.png";
+                }
+            }
+        } else {
+            //If we have a dash ability, we set the icon to the correct one.
+            abilityName = "DashAbility";
+            if (entity.HasComponent("Sprite")) {
+                (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\Superman-01.png";
+            }
+        }
+
         EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
-        if(cooldownTextEntity.Valid()) {
-            if(cooldownTextEntity.HasComponent("Text"))
-            {
-                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
-                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
-                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
-                std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
-                if(entity.HasComponent("Fill")) {
-                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
+        //TODO: Fix so this track correctly for shield and sprint depending on how they work.
+        double maxAbilityCD, currentAbilityCD;
+
+        if (abilityName == "DashAbility") {
+            maxAbilityCD = (double)abilityEntity[abilityName]["CoolDownMaxTimer"];
+            currentAbilityCD = (double)abilityEntity[abilityName]["CoolDownTimer"];
+            currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+
+            if (cooldownTextEntity.Valid()) {
+                if (cooldownTextEntity.HasComponent("Text")) {
+                    std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
                 }
             }
         }
+
+        if (abilityName == "ShieldAbility") {
+            maxAbilityCD = 0.0;
+            currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
+        }
+
+        if (abilityName == "SprintAbility") {
+            maxAbilityCD = 0.0;
+            currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
+        }
+
+        if (entity.HasComponent("Fill")) {
+            entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD;
+        }
+
+
+
     }
 }

src/Game/Systems/AmmoPickupSystem.cpp

@@ -96,6 +96,7 @@ bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
     }
 
     currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
+
     return false;
 }
 
@@ -114,8 +115,11 @@ bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
 }
 
 void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+    //trigger should be valid but if it isnt we just return (to avoid crash)
+    if (!trigger.Valid()) {
+        return;
+    }
     int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
-    int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
     int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
 
     Events::AmmoPickup ePlayerAmmoPickup;
@@ -123,9 +127,6 @@ void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
     ePlayerAmmoPickup.Player = player;
     m_EventBroker->Publish(ePlayerAmmoPickup);
 
-    //immediately give the player the ammo (on server)
-    currentAmmo = std::min(currentAmmo + ammoGiven, maxWeaponAmmo);
-
     //copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
     //we need to copy all values since each value can be different for each ammoPickup
     m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],

src/Game/Systems/BoostSystem.cpp

@@ -11,10 +11,16 @@ bool BoostSystem::OnPlayerDamage(Events::PlayerDamage& e)
     if (e.Victim.ID == e.Inflictor.ID) {
         return false;
     }
-    if (!e.Victim.Valid() && e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+
+    if (!e.Victim.Valid() || !LocalPlayer.Valid()) {
         return false;
     }
-    if (!e.Inflictor.Valid() || !e.Victim.Valid()) {
+
+    if (e.Victim != LocalPlayer && !e.Victim.IsChildOf(LocalPlayer)) {
+        return false;
+    }
+
+    if (!e.Inflictor.Valid()) {
         return false;
     }
 

src/Game/Systems/CapturePointHUDSystem.cpp

@@ -9,7 +9,7 @@ CapturePointHUDSystem::CapturePointHUDSystem(SystemParams params)
 
 void CapturePointHUDSystem::Update(double dt)
 {
-    bool LoadCheck = true;
+    bool loadCheck = true;
     int redTeam;
     int blueTeam;
     int spectatorTeam;
@@ -35,11 +35,11 @@ void CapturePointHUDSystem::Update(double dt)
             //Check if the HUD corresponds to the Capture Point Number
             if (HUD_ID == (int)entityCP["CapturePoint"]["CapturePointNumber"]) {
                 ComponentWrapper& teamComponent = entityCP["Team"];
-                if (LoadCheck) {
+                if (loadCheck) {
                     redTeam = (int)teamComponent["Team"].Enum("Red");
                     blueTeam = (int)teamComponent["Team"].Enum("Blue");
                     spectatorTeam = (int)teamComponent["Team"].Enum("Spectator");
-                    LoadCheck = false;
+                    loadCheck = false;
                 }
                 //Color hud with team color
                 auto capturePointTeam = (int)teamComponent["Team"];

src/Game/Systems/CapturePointSystem.cpp

@@ -69,6 +69,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
     int ownedBy = teamComponent["Team"];
     int redTeamPlayersStandingInside = 0;
     int blueTeamPlayersStandingInside = 0;
+    //note: old color system
     if (capturePointEntity.HasComponent("Model")) {
         //Now sets team color to the capturepoint, or white if it is uncaptured.
         capturePointEntity["Model"]["Color"] = ownedBy == blueTeam ? glm::vec4(0, 0.0f, 1, 0.3) : ownedBy == redTeam ? glm::vec4(1, 0.0f, 0, 0.3) : glm::vec4(1, 1, 1, 0.3);
@@ -102,7 +103,18 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
             nextPossibleCapturePoint["Blue"] = i - 1;
         }
     }
+
     if (m_RecentlyCapturedNeedNextCapturePointNow) {
+        //change what model is displaying (change all in case 2 capturepoints has been captured on the same frame)
+        for (int i = 0; i < m_NumberOfCapturePoints; i++) {
+            auto owner = (int)m_CapturePointNumberToEntityMap[i]["Team"]["Team"];
+            if (m_CapturePointNumberToEntityMap[i].FirstChildByName("Red").ID != EntityID_Invalid) {
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Red")["Model"]["Visible"] = owner == redTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Blue")["Model"]["Visible"] = owner == blueTeam ? true : false;
+                (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Spectator")["Model"]["Visible"] = owner == spectatorTeam ? true : false;
+            }
+        }
+        //save the next cap points and publish the captured event
         m_CapturedEvent.BlueTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Blue"]];
         m_CapturedEvent.RedTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Red"]];
         m_EventBroker->Publish(m_CapturedEvent);

src/Game/Systems/HealthSystem.cpp

@@ -12,15 +12,7 @@ HealthSystem::HealthSystem(SystemParams params)
 }
 
 void HealthSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHealth, double dt)
-{
-    double& health = cHealth["Health"];
-    if (health <= 0.0) {
-        Events::PlayerDeath ePlayerDeath;
-        ePlayerDeath.Player = entity;
-        m_EventBroker->Publish(ePlayerDeath);
-        //Note: we will delete the entity in PlayerDeathSystem
-    }
-}
+{ }
 
 bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
 {
@@ -35,7 +27,16 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
     if (playerBoostDefenderEntity.Valid()) {
         e.Damage -= (double)playerBoostDefenderEntity["BoostDefender"]["StrengthOfEffect"];
     }
-    health -= e.Damage;
+    if (health > 0) {
+        health -= e.Damage;
+        if (health <= 0.0) {
+            Events::PlayerDeath ePlayerDeath;
+            ePlayerDeath.Player = e.Victim;
+            ePlayerDeath.Killer = e.Inflictor;
+            m_EventBroker->Publish(ePlayerDeath);
+            //Note: we will delete the entity in PlayerDeathSystem
+        }
+    }
 
     return true;
 }