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

# Conflicts:
#	assets

include/Engine/Core/EPlayerDeath.h

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

include/Engine/Core/EntityWrapper.h

@@ -29,6 +29,7 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstParentByName(const std::string& parentEntityName);
     EntityWrapper FirstChildByName(const std::string& name);
+    EntityWrapper FirstLevelChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
     EntityWrapper Clone(EntityWrapper parent = EntityWrapper::Invalid);
     std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);

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/AnimationSystem.h

@@ -3,27 +3,32 @@
 
 #include "GLM.h"
 
-#include "Common.h"
-#include "Core/System.h"
-#include "Core/ResourceManager.h"
+#include "../Common.h"
+#include "../Core/System.h"
+#include "../Core/ResourceManager.h"
 #include "Rendering/Model.h"
-#include "Rendering/EAnimationComplete.h"
 #include "Rendering/Skeleton.h"
-#include <imgui/imgui.h>
+#include "Rendering/BlendTree.h"
+#include "Rendering/EAutoAnimationBlend.h"
+#include "../Core/EntityWrapper.h"
+#include "Rendering/AutoBlendQueue.h"
+#include "../Input/EInputCommand.h"
+#include "imgui/imgui.h"
 
-class AnimationSystem : public PureSystem
+class AnimationSystem : public ImpureSystem
 {
 public:
-    AnimationSystem(SystemParams params)
-        : System(params)
-        , PureSystem("Animation")
-    {
-
-    }
+    AnimationSystem(SystemParams params);
     ~AnimationSystem() { }
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+    virtual void Update(double dt) override;
 private:
+    void CreateBlendTrees();
+    void UpdateAnimations(double dt);
+    void UpdateWeights(double dt);
 
+    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
+    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
+    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

@@ -0,0 +1,46 @@
+#ifndef AutoBlendQueue_h__
+#define AutoBlendQueue_h__
+
+#include "../Core/ResourceManager.h"
+#include "Skeleton.h"
+#include "Model.h"
+#include "BlendTree.h"
+#include "../Core/EntityWrapper.h"
+
+class AutoBlendQueue
+{
+public:
+    struct AutoBlendJob
+    {
+        EntityWrapper RootNode = EntityWrapper::Invalid;
+        double Duration;
+        double CurrentTime = 0.0;
+        double Delay = 0.0;
+        EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+        BlendTree::AutoBlendInfo BlendInfo;
+    };
+
+    struct AutoblendNode
+    {
+        AutoBlendJob BlendJob;
+        double StartTime;
+        double EndTime;
+    };
+
+    AutoBlendQueue() { };
+
+    void Insert(AutoBlendJob autoBlendJob);
+    void UpdateTime(double dt);
+
+    void PrintQueue();
+    bool HasActiveBlendJob();
+    std::shared_ptr<BlendTree> GetBlendTree();
+
+    AutoBlendQueue::AutoBlendJob& GetActiveBlendJob();
+private:
+     std::list<AutoblendNode> m_BlendQueue;
+    
+
+};
+
+#endif

include/Engine/Rendering/BlendTree.h

@@ -0,0 +1,101 @@
+#ifndef BlendTree_h__
+#define BlendTree_h__
+
+#include "Common.h"
+#include "../GLM.h"
+#include "Skeleton.h"
+#include "../Core/EntityWrapper.h"
+#include "../Core/World.h"
+#include <stack>
+
+class BlendTree
+{
+public:
+    enum class NodeType
+    {
+        Additive,
+        Blend,
+        Override,
+        Animation,
+    };
+
+    
+
+    struct Node
+    {
+        std::string Name;
+        EntityWrapper Entity;
+        Node* Parent = nullptr;
+        Node* Child[2] = { nullptr, nullptr };
+        NodeType Type;
+        std::map<int, Skeleton::PoseData> Pose;
+        bool SubTreeRoot = false;
+        double Weight = 0.0;
+
+        Node* Next() {
+            Node* next = this;
+
+            if (next->Child[1] == nullptr) {
+                // Node has no right child
+                next = this;
+                while (next->Parent != nullptr && next == next->Parent->Child[1]) {
+                    next = next->Parent;
+                }
+                next = next->Parent;
+            } else {
+                // Find the leftmost node in the right subtree
+                next = next->Child[1];
+                while (next->Child[0] != nullptr) {
+                    next = next->Child[0];
+                }
+            }
+
+            return next;
+
+        }
+    };
+
+  
+    struct AutoBlendInfo
+    {
+        std::string NodeName;
+        double progress;
+        bool Start;
+        bool SingleBlend;
+        double Weight;
+        std::unordered_map<EntityWrapper, double> StartWeights;
+    };
+
+    
+
+    BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton);
+    ~BlendTree();
+
+
+    std::vector<glm::mat4> GetFinalPose() { return m_FinalPose; }
+    glm::mat4 GetBoneTransform(int boneID);
+    bool IsValid() { return  (m_Root == nullptr ? false : true); }
+
+    void PrintTree();
+    BlendTree::AutoBlendInfo AutoBlendStep(AutoBlendInfo blendInfo);
+
+    BlendTree::Node* GetCommonParent(std::string NodeName1, std::string NodeName2);
+    BlendTree::Node* FirstCommonParent(Node* node1, Node* node2);
+
+    EntityWrapper GetSubTreeRoot(std::string nodeName);
+
+private:
+    Skeleton* m_Skeleton = nullptr;
+    Node* m_Root = nullptr;
+
+    std::vector<glm::mat4> m_FinalPose;
+    std::map<int, glm::mat4> m_FinalBoneTransforms;
+
+    std::vector<glm::mat4> AccumulateFinalPose();
+    BlendTree::Node* FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity);
+    std::vector<BlendTree::Node*> FindNodesByName(std::string name);
+
+    void Blend(std::map<int, Skeleton::PoseData>& pose);
+};
+
+#endif

include/Engine/Rendering/BoneAttachmentSystem.h

@@ -8,6 +8,7 @@
 #include "Core/ResourceManager.h"
 #include "Rendering/Model.h"
 #include "Rendering/Skeleton.h"
+#include "Rendering/BlendTree.h"
 
 //Needs to be a higher orderlevel than AnimationSystem
 class BoneAttachmentSystem : public PureSystem

include/Engine/Rendering/EAutoAnimationBlend.h

@@ -0,0 +1,29 @@
+#ifndef Events_AutoAnimationBlend_h__
+#define Events_AutoAnimationBlend_h__
+
+#include "../Core/EventBroker.h"
+#include "../Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AutoAnimationBlend : Event
+{
+    EntityWrapper RootNode = EntityWrapper::Invalid;
+    std::string NodeName;
+    double Duration = 0.0;
+    double Delay = 0.0;
+    
+    bool Start = false;
+    bool Reverse = false;
+    bool Restart = false;
+    bool SingleLevelBlend = false;
+
+    double Weight = -1.0;
+
+    EntityWrapper AnimationEntity = EntityWrapper::Invalid;
+};
+
+}
+
+#endif

include/Engine/Rendering/ModelJob.h

@@ -15,6 +15,7 @@
 #include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
+#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
@@ -123,32 +124,14 @@ struct ModelJob : RenderJob
             Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                if (world->HasComponent(Entity, "Animation")) {
-                    auto animationComponent = world->GetComponent(Entity, "Animation");
+                
+                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
 
-                    for (int i = 1; i <= 3; i++) {
-                        ::Skeleton::AnimationData animationData;
-                        animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
-                        if (animationData.animation == nullptr) {
-                            continue;
-                        }
-                        animationData.time = (double)animationComponent["Time" + std::to_string(i)];
-                        animationData.weight = (double)animationComponent["Weight" + std::to_string(i)];
-
-                        Animations.push_back(animationData);
-                    }
-                }
-
-                if (world->HasComponent(Entity, "AnimationOffset")) {
-                    auto animationOffsetComponent = world->GetComponent(Entity, "AnimationOffset");
-                    AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(animationOffsetComponent["AnimationName"]);
-                    AnimationOffset.time = (double)animationOffsetComponent["Time"];
-                } else {
-                    AnimationOffset.animation = nullptr;
+                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
+                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
                 }
             }
         }
-            
     };
 
     unsigned int TextureID;
@@ -167,10 +150,7 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    
-
+    std::shared_ptr<::BlendTree> BlendTree = nullptr;
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;

include/Engine/Rendering/Skeleton.h

@@ -6,27 +6,9 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
+#include "../Core/EntityWrapper.h"
 
-//struct Bone
-//{
-//	Bone(std::string name, glm::mat4 offsetMatrix)
-//		: Name(name)
-//		, OffsetMatrix(offsetMatrix)
-//	{ }
-//
-//	~Bone()
-//	{
-//		for (auto kv : Children) {
-//			delete kv.second;
-//		}
-//	}
-//
-//	std::string Name;
-//	glm::mat4 OffsetMatrix;
-//	glm::mat4 LocalMatrix;
-//
-//	std::map<std::string, Bone*> Children;
-//};
+class BlendTree;
 
 class Skeleton
 {
@@ -68,58 +50,43 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct AnimationData
-    {
-        const Animation* animation;
-        float time;
-        float weight;
-    };
-
-    struct JointFrameTransform {
-        glm::vec3 PositionInterp = glm::vec3(0);
-        glm::quat RotationInterp = glm::quat();
-        glm::vec3 ScaleInterp = glm::vec3(0);
-        float Weight;
-    };
-
-    struct AnimationOffset {
-        const Animation* animation;
-        float time;
+    struct PoseData {
+        glm::vec3 Translation;
+        glm::quat Orientation;
+        glm::vec3 Scale;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-
 	std::map<int, Bone*> Bones;
 
+    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+
 	// Attach a new bone to the skeleton
 	// Returns: New bone index
 	int CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix);
-
 	int GetBoneID(std::string name);
-
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion = false);
-    std::vector<glm::mat4>  GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion = false);
-
     const Animation* GetAnimation(std::string name);
 
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
-    void AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& frameBones, const Bone* bone, glm::mat4 parentMatrix);
+    std::map<int, Skeleton::PoseData> GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion = false);
+    
+    std::map<int, Skeleton::PoseData> BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight);
+    std::map<int, Skeleton::PoseData> OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose);
+    std::map<int, Skeleton::PoseData> BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose);
+    void GetFinalPose(std::map<int, Skeleton::PoseData>& boneMatrices, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms);
+    
+    std::vector<glm::mat4> GetTPose();
 
-    void PrintSkeleton();
-	void PrintSkeleton(const Bone* parent, int depthCount);
-	std::map<std::string, Animation> Animations;
-
-    glm::mat4 GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix);
-    glm::mat4 GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix);
-    int GetKeyframe(const Animation& animation, double time);
 
+    std::map<std::string, Animation> Animations;
 private:
-
-    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
+    Skeleton::PoseData GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time);
+    
+    void AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix);
+    void AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
+    void AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Game/Systems/LifetimeSystem.h

@@ -10,7 +10,7 @@ public:
         : System(params)
         , PureSystem("Lifetime")
     {
-        LOG_INFO("ASDASDASSA");
+
     }
 
     virtual void Update(double dt) override;

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/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/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/Schema/Components.xsd

@@ -33,7 +33,6 @@
 	<xs:include schemaLocation="Components/HiddenForLocalPlayer.xsd"/>
 	<xs:include schemaLocation="Components/HealthPickup.xsd"/>
 	<xs:include schemaLocation="Components/AmmoPickup.xsd"/>
-	<xs:include schemaLocation="Components/AnimationOffset.xsd"/>
 	<xs:include schemaLocation="Components/DashAbility.xsd"/>
 	<xs:include schemaLocation="Components/ShieldAbility.xsd"/>
 	<xs:include schemaLocation="Components/SprintAbility.xsd"/>
@@ -48,6 +47,9 @@
 	<xs:include schemaLocation="Components/TextFieldReader.xsd"/>
 	<xs:include schemaLocation="Components/Menu.xsd"/>
 	<xs:include schemaLocation="Components/KillFeed.xsd"/>
+	<xs:include schemaLocation="Components/BlendOverride.xsd"/>
+	<xs:include schemaLocation="Components/Blend.xsd"/>
+	<xs:include schemaLocation="Components/BlendAdditive.xsd"/>
 	<xs:include schemaLocation="Components/Page.xsd"/>
 	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
 	<xs:include schemaLocation="Components/Button.xsd"/>
@@ -61,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/Animation.xml

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Animation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Animation.xsd">
-	<AnimationName1></AnimationName1>
-	<Weight1>1.0</Weight1>
-	<Time1>0</Time1>
-	<Speed1>0</Speed1>
-	<Loop1>true</Loop1>
-	<AnimationName2></AnimationName2>
-	<Weight2>1.0</Weight2>
-	<Time2>0</Time2>
-	<Speed2>0</Speed2>
-	<Loop2>true</Loop2>
-	<AnimationName3></AnimationName3>
-	<Weight3>1.0</Weight3>
-	<Time3>0</Time3>
-	<Speed3>0</Speed3>
-	<Loop3>true</Loop3>
+	<AnimationName></AnimationName>
+	<Time>0</Time>
+	<Play>false</Play>
+	<Reverse>false</Reverse>
+	<Speed>0</Speed>
+	<Loop>true</Loop>
+	<Additive>false</Additive>
 </Animation>

resources/Schema/Components/Animation.xsd

@@ -2,27 +2,17 @@
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
 	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
 	<xs:element name="Animation">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="AnimationName1" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight1" type="t:double" minOccurs="0"/>
-				<xs:element name="Time1" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed1" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop1" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName2" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight2" type="t:double" minOccurs="0"/>
-				<xs:element name="Time2" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed2" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop2" type="t:bool" minOccurs="0"/>
-				<xs:element name="AnimationName3" type="t:string" minOccurs="0"/>
-				<xs:element name="Weight3" type="t:double" minOccurs="0"/>
-				<xs:element name="Time3" type="t:double" minOccurs="0"/>
-				<xs:element name="Speed3" type="t:double" minOccurs="0"/>
-				<xs:element name="Loop3" type="t:bool" minOccurs="0"/>
+				<xs:element name="AnimationName" type="t:string" minOccurs="0"/>
+				<xs:element name="Time" type="t:double" minOccurs="0"/>
+				<xs:element name="Speed" type="t:double" minOccurs="0"/>
+				<xs:element name="Play" type="t:bool" minOccurs="0"/>
+				<xs:element name="Reverse" type="t:bool" minOccurs="0"/>
+				<xs:element name="Loop" type="t:bool" minOccurs="0"/>
+				<xs:element name="Additive" type="t:bool" minOccurs="0"/>
 			</xs:all>
-			<xs:attribute name="replicated" type="xs:boolean" fixed="true"/>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/AnimationOffset.xml

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

resources/Schema/Components/AnimationOffset.xsd

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="AnimationOffset">
-	<xs:annotation>
-		<xs:documentation>Aim animation offset for the skeleton</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="AnimationName" type="t:string" minOccurs="0"/>
-				<xs:element name="Time" type="t:double" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</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/Blend.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Blend xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Blend.xsd">
+	<Pose1></Pose1>
+	<Pose2></Pose2>
+	<Weight>0.5</Weight>
+	<SubTreeRoot>false</SubTreeRoot>
+</Blend>

resources/Schema/Components/Blend.xsd

@@ -0,0 +1,15 @@
+<?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="Blend">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Pose1" type="t:string" minOccurs="0"/>
+				<xs:element name="Pose2" type="t:string" minOccurs="0"/>
+				<xs:element name="Weight" type="t:double" minOccurs="0"/>
+				<xs:element name="SubTreeRoot" type="t:bool" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BlendAdditive.xml

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

resources/Schema/Components/BlendAdditive.xsd

@@ -0,0 +1,13 @@
+<?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="BlendAdditive">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Adder" type="t:string" minOccurs="0"/>
+				<xs:element name="Receiver" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/BlendOverride.xml

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

resources/Schema/Components/BlendOverride.xsd

@@ -0,0 +1,13 @@
+<?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="BlendOverride">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="Master" type="t:string" minOccurs="0"/>
+				<xs:element name="Slave" type="t:string" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/ScoreIdentity.xml

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

resources/Schema/Components/ScoreIdentity.xsd

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

resources/Schema/Components/ScoreScreen.xml

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

resources/Schema/Components/ScoreScreen.xsd

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

resources/Schema/Components/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/AnimationTests2.xml

@@ -2,6 +2,10 @@
 <Entity name="AnimationTests" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:SceneLight>
+      <Gamma>0.30000001192092896</Gamma>
+      <Exposure>3</Exposure>
+    </c:SceneLight>
     <c:Transform/>
   </Components>
 
@@ -9,138 +13,542 @@
     <Entity>
       <Components>
         <c:Transform>
-          <Position X="-0.100000001" Y="-1.11500001" Z="-3.10500026"/>
+          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
+          <Orientation X="0" Y="2.41300011" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
-            <c:DirectionalLight/>
+            <c:DirectionalLight>
+              <Intensity>0</Intensity>
+            </c:DirectionalLight>
             <c:Model>
               <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
             </c:Model>
             <c:Transform>
               <Position X="0" Y="2.42800021" Z="-2.80000019"/>
-              <Orientation X="5.40800047" Y="3.65100026" Z="0"/>
+              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Running">
-          <Components>
-            <c:Animation>
-              <AnimationName1>Run</AnimationName1>
-              <Weight1>0.5</Weight1>
-              <Time1>0.60188997954429357</Time1>
-              <Speed1>-1</Speed1>
-              <Speed2>1</Speed2>
-              <Weight2>0.5</Weight2>
-              <Time2>0.96957233017255007</Time2>
-              <Time3>0.093923612201312068</Time3>
-              <Speed3>1</Speed3>
-            </c:Animation>
-            <c:AnimationOffset>
-              <AnimationName>AimRifle</AnimationName>
-              <Time>0.5</Time>
-            </c:AnimationOffset>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-            </c:Model>
-            <c:Transform>
-              <Position X="-0.690088332" Y="0" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="R_Arm_Weapon_Joint">
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                  <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0.161975682" Y="1.06281972" Z="-0.216630161"/>
-                  <Orientation X="-0.064812161" Y="-0.0739696771" Z="0.143780142"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity>
+        <Entity name="Light">
           <Components>
             <c:PointLight>
               <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
-              <Radius>10</Radius>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
             </c:PointLight>
             <c:Transform>
-              <Position X="-0.375567257" Y="2.13093901" Z="-0.718547285"/>
+              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
             </c:Transform>
           </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Assault">
+          <Components>
+            <c:BlendAdditive>
+              <Adder>AimBlend</Adder>
+              <Receiver>FinalBlend</Receiver>
+            </c:BlendAdditive>
+            <c:Model>
+              <GlowIntensity>5</GlowIntensity>
+              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+            </c:Model>
+            <c:Transform/>
+          </Components>
           <Children>
-            <Entity>
+            <Entity name="WeaponAttachment">
               <Components>
-                <c:PointLight>
-                  <Color A="1" B="1" G="0.70588237" R="0.70588237"/>
-                  <Radius>10</Radius>
-                </c:PointLight>
+                <c:BoneAttachment>
+                  <BoneName>R_Arm_Weapon_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Model>
+                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                </c:Model>
                 <c:Transform>
-                  <Position X="-1.96873236" Y="0" Z="0"/>
+                  <Position X="0.154985309" Y="1.07679462" Z="-0.201120675"/>
+                  <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+                  <Orientation X="-0.0289514996" Y="-0.119508959" Z="0.18072544"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
+            <Entity name="AimBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>AimPrimary</Pose1>
+                  <Pose2>AimSecondary</Pose2>
+                  <Weight>0</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="AimPrimary">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimRifleA</AnimationName>
+                      <Time>0.49999979138374329</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <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>
+              </Children>
+            </Entity>
+            <Entity name="FinalBlend">
+              <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>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="StandCrouchBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>StandMovement</Pose1>
+                          <Pose2>CrouchMovement</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="StandMovement">
+                          <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>RunWalkBlend</Pose1>
+                                  <Pose2>StrafeLRBlend</Pose2>
+                                  <Weight>0</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="RunWalkBlend">
+                                  <Components>
+                                    <c:Blend>
+                                      <Pose1>Walk</Pose1>
+                                      <Pose2>Run</Pose2>
+                                      <Weight>1</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Walk">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>WalkF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Run">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>RunF</AnimationName>
+                                          <Time>0.89967686078176468</Time>
+                                          <Speed>1</Speed>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                                <Entity name="StrafeLRBlend">
+                                  <Components>
+                                    <c:Blend>
+                                      <Pose1>Left</Pose1>
+                                      <Pose2>Right</Pose2>
+                                      <Weight>0</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Left">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>StrafeLeftF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Right">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>StrafeRightF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="Idle">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleF</AnimationName>
+                                  <Time>0.33219857512804407</Time>
+                                  <Speed>1</Speed>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="CrouchMovement">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>MovementBlend</Pose1>
+                              <Pose2>Idle</Pose2>
+                            </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</Weight>
+                                    </c:Blend>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children>
+                                    <Entity name="Left">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>CrouchStrafeLeftF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                    <Entity name="Right">
+                                      <Components>
+                                        <c:Animation>
+                                          <AnimationName>CrouchStrafeRightF</AnimationName>
+                                        </c:Animation>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
+                                  </Children>
+                                </Entity>
+                                <Entity name="Walk">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>CrouchWalkF</AnimationName>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                              </Children>
+                            </Entity>
+                            <Entity name="Idle">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchF</AnimationName>
+                                  <Time>0.86553330718370836</Time>
+                                  <Speed>1</Speed>
+                                </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>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Jump">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>JumpF</AnimationName>
+                              <Time>0.5</Time>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>DashFBBlend</Pose1>
+                              <Pose2>DashLRBlend</Pose2>
+                              <Weight>0</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="DashFBBlend">
+                              <Components>
+                                <c:Blend>
+                                  <Pose1>DashForward</Pose1>
+                                  <Pose2>DashBackward</Pose2>
+                                  <Weight>1</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="DashForward">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashForwardF</AnimationName>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashBackward">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashBackwardF</AnimationName>
+                                      <Time>1</Time>
+                                      <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>0</Weight>
+                                </c:Blend>
+                                <c:Transform/>
+                              </Components>
+                              <Children>
+                                <Entity name="DashLeft">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashLeftF</AnimationName>
+                                      <Time>1</Time>
+                                      <Loop>false</Loop>
+                                    </c:Animation>
+                                    <c:Transform/>
+                                  </Components>
+                                  <Children/>
+                                </Entity>
+                                <Entity name="DashRight">
+                                  <Components>
+                                    <c:Animation>
+                                      <AnimationName>DashRightF</AnimationName>
+                                      <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>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ReloadSwitch">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>ReloadSwitchU</AnimationName>
+                          <Time>0.86721706215490468</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="WeaponActionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>IdleBlend</Pose1>
+                          <Pose2>ShootBlend</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="IdleBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>IdlePrimary</Pose1>
+                              <Pose2>IdleSecondary</Pose2>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="IdlePrimary">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleAssaultRifleU</AnimationName>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="IdleSecondary">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleSecWepU</AnimationName>
+                                </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.19605135393254369</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>
+        <Entity name="Plane">
           <Components>
             <c:Model>
               <Resource>Models/Core/UnitPlane.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Scale X="10" Y="1" Z="10"/>
+              <Scale X="5" Y="1" Z="5"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity>
+        <Entity name="Light">
           <Components>
-            <c:Animation>
-              <AnimationName1>ShootFastRifle</AnimationName1>
-              <Time1>0.056234247235838808</Time1>
-              <Speed1>1</Speed1>
-              <Speed2>1</Speed2>
-              <AnimationName2>Idl</AnimationName2>
-              <Weight2>0.5</Weight2>
-              <Time2>1.8308673495784191</Time2>
-              <AnimationName3>StrafeRigh</AnimationName3>
-              <Weight3>0.5</Weight3>
-              <Time3>0.32167823998061529</Time3>
-              <Speed3>1</Speed3>
-            </c:Animation>
-            <c:Model>
-              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-            </c:Model>
-            <c:Transform/>
+            <c:PointLight>
+              <Color A="1" B="0.956862748" G="0.960784316" R="0.819607854"/>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-1.36898434" Y="1.37392569" Z="0.620898128"/>
+            </c:Transform>
           </Components>
-          <Children>
-            <Entity>
-              <Components>
-                <c:BoneAttachment>
-                  <BoneName>R_Arm_Weapon_Joint</BoneName>
-                </c:BoneAttachment>
-                <c:Model>
-                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
-                </c:Model>
-                <c:Transform>
-                  <Position X="0" Y="0.803468645" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Radius>8</Radius>
+              <Intensity>0.80000001192092896</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.127636135" Y="1.37392569" Z="-1.52101767"/>
+            </c:Transform>
+          </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/BlendTreeTest.xml

@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="AnimationTests" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:SceneLight>
+      <Gamma>0.30000001192092896</Gamma>
+      <Exposure>3</Exposure>
+    </c:SceneLight>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Transform>
+          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
+          <Orientation X="0" Y="2.41300011" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:DirectionalLight>
+              <Intensity>0</Intensity>
+            </c:DirectionalLight>
+            <c:Model>
+              <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="2.42800021" Z="-2.80000019"/>
+              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Assault">
+          <Components>
+            <c:BlendAdditive>
+              <Adder>AimBlend</Adder>
+              <Receiver>FinalBlend</Receiver>
+            </c:BlendAdditive>
+            <c:Model>
+              <GlowIntensity>5</GlowIntensity>
+              <Resource>Models/Characters/Assault/AssaultBlue.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>
+                  <Position X="0.157041892" Y="1.0375092" Z="-0.236085728"/>
+                  <Orientation X="-0.00432149554" Y="-0.0343661793" Z="0.138000518"/>
+                  <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="AimBlend">
+              <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="FinalBlend">
+              <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.012867419418159054</Weight>
+                          <SubTreeRoot>true</SubTreeRoot>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <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.28642783708275554</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.55844134110665933</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.46802045811629411</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.49153598799640874</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>1.9353306180083529</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </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.075577760544797146</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.0028992224955801671</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.78127320767298225</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">
+                      <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>0.71065052212526325</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="IdleSecondary">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>IdleSecWepU</AnimationName>
+                                  <Time>0.71417556241505054</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="Plane">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitPlane.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Scale X="5" Y="1" Z="5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.956862748" G="0.960784316" R="0.819607854"/>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-1.36898434" Y="1.37392569" Z="0.620898128"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Radius>8</Radius>
+              <Intensity>0.80000001192092896</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.127636135" Y="1.37392569" Z="-1.52101767"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/BlueRifle

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BoneAttachment>
+      <BoneName>R_Arm_Weapon_Joint</BoneName>
+    </c:BoneAttachment>
+    <c:Model>
+      <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.136586398" Y="0.92942369" Z="-0.139760047"/>
+      <Orientation X="-0.601206124" Y="0.132410824" Z="-0.129014626"/>
+    </c:Transform>
+  </Components>
+
+  <Children/>
+
+</Entity>

resources/Schema/Entities/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/DefenderWeaponViewRed.xml

@@ -1,99 +0,0 @@
-<?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">
-
-  <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>
-    </c:Model>
-    <c:Transform>
-      <Position X="0.120430306" Y="0.775375426" Z="1.36542225"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.00191565475" Y="0.0324025005" Z="-0.2021029"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="FirstPersonReloadSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="AmmunitionHUD">
-      <Components>
-        <c:AmmunitionHUD/>
-        <c:Transform>
-          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
-          <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="AmmunitionHUDBackground">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <Color A="0.588235319" B="0" G="0" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0" Z="-0.00200000009"/>
-              <Scale X="0.119999997" Y="0.119999997" Z="0.119999997"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="AmmunitionText">
-          <Components>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="MagazineAmmo">
-              <Components>
-                <c:Text>
-                  <Content>32</Content>
-                  <Resource>Fonts/DroidSans.ttf,64</Resource>
-                  <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
-                </c:Text>
-                <c: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>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/DefenderWeaponWorldRed.xml

@@ -1,41 +0,0 @@
-<?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">
-
-  <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>
-    </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>
-  </Components>
-
-  <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayRed.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.000284185546" Y="0.0318552479" Z="-0.193328083"/>
-        </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>

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/PlayerAssaultFallbackRed.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/PlayerAssaultFallbackBlue.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>
@@ -98,7 +98,7 @@
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="0.800000012" Y="0" Z="0"/>
+              <Position X="-0.600000024" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -111,7 +111,7 @@
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="-0.600000024" Y="0" Z="0"/>
+              <Position X="0.800000012" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>

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/PlayerHUD.xml

@@ -0,0 +1,399 @@
+<?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="HealthHUD">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="HealthBar">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="0.301960796" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:HealthHUD/>
+            <c:Sprite>
+              <DiffuseTexture>Textures/HUD/HealthHudTriMain.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.588235319" B="0" G="0" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
+              <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+              <Scale X="0.0799999982" Y="0.333000004" Z="0.150000006"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="BoostIcons">
+              <Components>
+                <c:BoostIconsHUD/>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Sniper">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="0.345098048" G="0" R="1"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.225000009" Y="0.38500002" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Assault">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.225000009" Y="0.168000013" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Defender">
+                  <Components>
+                    <c:Fill>
+                      <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
+                    </c:Fill>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                      <DepthSort>false</DepthSort>
+                      <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.224999994" Y="0.27700001" Z="0"/>
+                      <Scale X="0.27700001" Y="0.100000001" Z="0.200000003"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="HealthText">
+          <Components>
+            <c:Fill>
+              <Percentage>1</Percentage>
+              <Color A="1" B="1" G="0" R="0"/>
+            </c:Fill>
+            <c:Text>
+              <Content>100/100</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+            </c:Text>
+            <c:HealthHUD/>
+            <c:Transform>
+              <Position X="-0.372000009" Y="-0.212000012" Z="0.0560000017"/>
+              <Orientation X="0" Y="0.410000026" Z="0"/>
+              <Scale X="0.0189999994" Y="0.0250000004" Z="0.0350000001"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="CapturePointHUD">
+      <Components>
+        <c:Transform>
+          <Position X="0" Y="0.190541431" Z="0"/>
+          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>2</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>3</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="1.62788737" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>4</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.300000012" B="1" G="1" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD>
+                  <CapturePointNumber>1</CapturePointNumber>
+                </c:CapturePointHUD>
+                <c:Fill>
+                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="1.57079637"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BackgroundHexagon">
+          <Components>
+            <c:Sprite>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <GlowMap></GlowMap>
+              <Color A="0.699999988" B="0" G="0" R="1"/>
+            </c:Sprite>
+            <c:Transform>
+              <Position X="-1.58304751" Y="0.919596612" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="ProgressionHexagon">
+              <Components>
+                <c:CapturePointHUD/>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0.699999988" B="0" G="0" R="1"/>
+                </c:Fill>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
+                  <GlowMap></GlowMap>
+                </c:Sprite>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.00999999978"/>
+                  <Orientation X="0" Y="0" Z="4.71238899"/>
+                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="KillFeed">
+      <Components>
+        <c:KillFeed/>
+        <c:Transform>
+          <Position X="0.486000031" Y="0.26000002" Z="0"/>
+          <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="KillFeed1">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillFeed2">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="-1" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="KillFeed3">
+          <Components>
+            <c:Text>
+              <Content></Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+              <Alignment>
+                <Right/>
+              </Alignment>
+            </c:Text>
+            <c:Transform>
+              <Position X="0" Y="-2" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="CapturePointArrow">
+      <Components>
+        <c:CapturePointArrowHUD/>
+        <c:Model>
+          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0" Y="0.714000046" Z="-1.30000007"/>
+          <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
+          <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/PlayerModel.xml

@@ -0,0 +1,542 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PlayerModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:BlendAdditive>
+      <Adder>BlendTreeAim</Adder>
+      <Receiver>BlendTreeAssault</Receiver>
+    </c:BlendAdditive>
+    <c:Shielded/>
+    <c:HiddenForLocalPlayer/>
+    <c:Model>
+      <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+      <Color A="1" B="1" G="0.25" R="0"/>
+      <Visible>false</Visible>
+    </c:Model>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity name="PrimaryAttachment">
+      <Components>
+        <c:BoneAttachment>
+          <BoneName>R_Arm_Weapon_Joint</BoneName>
+        </c:BoneAttachment>
+        <c:WeaponAttachment>
+          <Weapon>AssaultWeapon</Weapon>
+          <Person>
+            <ThirdPerson/>
+          </Person>
+        </c:WeaponAttachment>
+        <c:Spawner>
+          <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.165396646" Y="1.14537966" Z="-0.206537575"/>
+          <Orientation X="0.484640986" Y="-0.00695174001" Z="0.0685098693"/>
+        </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.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>
+          <Pose2>AimSecondary</Pose2>
+          <Weight>0</Weight>
+          <SubTreeRoot>true</SubTreeRoot>
+        </c:Blend>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="AimSecondary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimSecWepA</AnimationName>
+              <Time>0.71143966913223267</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="AimPrimary">
+          <Components>
+            <c:Animation>
+              <AnimationName>AimRifleA</AnimationName>
+              <Time>0.71143966913223267</Time>
+              <Loop>false</Loop>
+              <Additive>true</Additive>
+            </c:Animation>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="BlendTreeAssault">
+      <Components>
+        <c:BlendOverride>
+          <Master>ReloadSwitchBlend</Master>
+          <Slave>FinalMovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="FinalMovementBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>StandCrouchBlend</Pose1>
+              <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.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>
+                      <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.14300098890676338</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.41501449293066628</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.32459360994030106</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeRightF</AnimationName>
+                                  <Time>0.34810913982041569</Time>
+                                  <Speed>1</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleF</AnimationName>
+                          <Time>1.2585556863362655</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>0.56722367394927176</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="IdleSecondary">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleSecWepU</AnimationName>
+                          <Time>0.57074871423905904</Time>
+                          <Speed>1</Speed>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="ShootBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>ShootPrimary</Pose1>
+                      <Pose2>ShootSecondary</Pose2>
+                      <Weight>0</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ShootPrimary">
+                      <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>

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/Skeleton.xml

@@ -18,9 +18,9 @@
           <Transparent>true</Transparent>
         </c:Model>
         <c:Transform>
-          <Position X="0.47420007" Y="0.928898275" Z="0.0299553983"/>
+          <Position X="0.155832842" Y="1.12994993" Z="-0.201626897"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.100000001"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
+          <Orientation X="0.195066273" Y="-0.0870126858" Z="0.148657113"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -29,16 +29,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.448672563" Y="0.992614031" Z="0.0575723015"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
+          <Position X="0.202149346" Y="1.12270021" Z="-0.144635201"/>
+          <Scale X="0.0500000231" Y="0.0500000305" Z="0.0500000119"/>
+          <Orientation X="1.41306889" Y="0.0776072815" Z="-0.744222522"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -47,16 +48,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.12972948" Y="1.28044498" Z="-0.0855199769"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.178462029" Y="-0.240202308" Z="-0.227051333"/>
+          <Position X="0.0609518476" Y="1.16432548" Z="0.0783129707"/>
+          <Scale X="0.0500000194" Y="0.0500000082" Z="0.0500000194"/>
+          <Orientation X="0.311971247" Y="0.199406415" Z="0.162320927"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -65,16 +67,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.0566707924" Y="1.22090316" Z="-0.110467494"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0742288083" Y="1.12503755" Z="-0.00992172211"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -83,16 +86,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Neck</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="6.88049477e-05" Y="1.29971886" Z="-0.151777163"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-1.03466523" Y="-0.0017389874" Z="0.00627749134"/>
+          <Position X="0.0288712904" Y="1.20688999" Z="-0.0585537553"/>
+          <Scale X="0.0500000194" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0778672397" Y="-0.380205482" Z="-0.116210334"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -101,16 +105,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_3</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000299328996" Y="1.2487011" Z="-0.0936965123"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0190485716" Y="1.13146138" Z="-0.0447565243"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -119,16 +124,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_2</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000528411241" Y="1.1669693" Z="0.000368326902"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.00282198261" Y="1.01004541" Z="-0.0218831152"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -137,16 +143,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_1</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000317580998" Y="1.03476369" Z="7.06899816e-17"/>
-          <Scale X="0.0500000007" Y="0.100000001" Z="0.0500000007"/>
-          <Orientation X="-0.168994248" Y="-0.000270629855" Z="-6.74916964e-06"/>
+          <Position X="-0.00298201409" Y="0.878305078" Z="-0.0124331526"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000007"/>
+          <Orientation X="-0.478212297" Y="-1.01566339" Z="-0.374480605"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -155,15 +162,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Hip</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="0" Y="0.901226044" Z="0"/>
-          <Scale X="0.100000001" Y="0.0500000007" Z="0.0500000007"/>
+          <Position X="0" Y="0.745380521" Z="0"/>
+          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <Orientation X="-0.0850669593" Y="-0.351720452" Z="0.0214110892"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -172,16 +181,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.0735318959" Y="0.86343354" Z="0.00186898722"/>
+          <Position X="-0.0688988566" Y="0.704185605" Z="-0.0198653266"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.431212306" Y="-0.0456388369" Z="-0.00236316444"/>
+          <Orientation X="-0.124463096" Y="0.178934589" Z="0.0281526987"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -190,16 +200,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.0971027464" Y="0.534537971" Z="-0.158307418"/>
+          <Position X="-0.0895988718" Y="0.340622783" Z="0.022300493"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.435873091" Y="0.0584642813" Z="-0.0526505522"/>
+          <Orientation X="-0.634849846" Y="0.204822823" Z="0.0869619399"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -208,16 +219,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.136750847" Y="0.215778053" Z="0.0181705151"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
+          <Position X="-0.0861766189" Y="0.0597670376" Z="0.257741988"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000082"/>
+          <Orientation X="-0.185180262" Y="-0.00943047088" Z="-0.00198192359"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -226,16 +238,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.142155826" Y="0.180158257" Z="-0.171162993"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-7.45058151e-06" Y="-4.34406102e-05" Z="-2.32085604e-05"/>
+          <Position X="-0.0898738578" Y="-0.0101006478" Z="0.078159079"/>
+          <Scale X="0.0500000082" Y="0.0500000007" Z="0.0500000082"/>
+          <Orientation X="-0.185180262" Y="-0.00943047088" Z="-0.00198192359"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -244,16 +257,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.0569540039" Y="1.22099173" Z="-0.110411651"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0172477104" Y="1.11405122" Z="-0.107610352"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809071" Z="-0.158694059"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -262,16 +276,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Arm</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.129911453" Y="1.28064728" Z="-0.0853923708"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.558630228" Y="-0.558619261" Z="-0.988305748"/>
+          <Position X="-0.0692541152" Y="1.13922095" Z="-0.14491269"/>
+          <Scale X="0.0500000194" Y="0.0500000194" Z="0.0500000231"/>
+          <Orientation X="1.49024689" Y="-0.866028547" Z="1.11317146"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -280,16 +295,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Hand</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.454215586" Y="1.41859245" Z="-0.370613039"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931911349" Y="4.81306633e-05" Z="0.000111658264"/>
+          <Position X="0.100635156" Y="1.17628682" Z="-0.439798951"/>
+          <Scale X="0.0500000231" Y="0.0500000305" Z="0.050000038"/>
+          <Orientation X="0.026293885" Y="-0.262760967" Z="2.338521"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -298,16 +314,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.138541639" Y="1.30872273" Z="-0.144261822"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="-0.0505402647" Y="1.1960609" Z="-0.172250509"/>
+          <Scale X="0.0500000194" Y="0.0500000119" Z="0.0500000119"/>
+          <Orientation X="-0.295679778" Y="-1.03809094" Z="-0.506270111"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -316,16 +333,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Chin</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.00033863826" Y="1.2016536" Z="-0.251047492"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0539259352" Y="1.22412896" Z="-0.183897316"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -334,16 +352,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Head</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000338668207" Y="1.33565879" Z="-0.254856527"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0481297895" Y="1.31164014" Z="-0.0825063139"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -352,16 +371,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Perietal</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.000338537793" Y="1.43159795" Z="-0.410463303"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.931916714" Y="-9.67644155e-07" Z="2.18351502e-07"/>
+          <Position X="0.0686318353" Y="1.49197555" Z="-0.104337469"/>
+          <Scale X="0.0500000119" Y="0.0500000082" Z="0.0500000082"/>
+          <Orientation X="-0.0481163412" Y="-0.134963214" Z="-0.102023236"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -370,16 +390,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.312942117" Y="1.35850036" Z="-0.246365055"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="0.353978485" Y="-0.15571253" Z="-0.903516531"/>
+          <Position X="-0.0776530653" Y="1.10232043" Z="-0.397976696"/>
+          <Scale X="0.0500000231" Y="0.0500000231" Z="0.0500000231"/>
+          <Orientation X="2.36848879" Y="-0.278962672" Z="2.07910991"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -388,16 +409,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.105701312" Y="0.499459773" Z="0.030466903"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-1.02907228" Y="-0.0580535792" Z="0.116703011"/>
+          <Position X="0.115077674" Y="0.503088951" Z="-0.267230242"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.511662602" Y="-0.216903374" Z="-0.0133549664"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -406,16 +428,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Elbow</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.309118003" Y="1.12181115" Z="0.00506293867"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.391992599" Y="-0.509281039" Z="-0.0413108058"/>
+          <Position X="0.301801801" Y="1.09683371" Z="0.023665078"/>
+          <Scale X="0.0500000231" Y="0.0500000194" Z="0.0500000194"/>
+          <Orientation X="1.67780411" Y="0.697954118" Z="-1.36570835"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -424,16 +447,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Top</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.074000001" Y="0.863433301" Z="0.00200000009"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.0984009728" Y="0.0146064674" Z="0.00352247525"/>
+          <Position X="0.0695244595" Y="0.711660385" Z="0.0306202006"/>
+          <Scale X="0.0500000007" Y="0.0500000007" Z="0.049999997"/>
+          <Orientation X="0.929966331" Y="0.0844758675" Z="0.0447596237"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -442,16 +466,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Foot</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.139749736" Y="0.334264338" Z="0.356020123"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
+          <Position X="0.137999952" Y="0.19909358" Z="-0.0635268986"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.193798333" Y="-0.056662742" Z="-0.0102932369"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -460,16 +485,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Toe</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.144308567" Y="0.298593462" Z="0.166685253"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.000313894066" Y="0.00262229913" Z="0.00155029749"/>
+          <Position X="0.153348058" Y="0.127739012" Z="-0.24189125"/>
+          <Scale X="0.0500000007" Y="0.0499999933" Z="0.049999997"/>
+          <Orientation X="-0.193798333" Y="-0.056662742" Z="-0.0102932369"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -478,16 +504,17 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
+          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
+          <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="19.6078434" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.13872239" Y="1.30850673" Z="-0.144398093"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.798247218" Y="0.000491484476" Z="-0.00077928009"/>
+          <Position X="0.0885034204" Y="1.22286928" Z="0.0661265627"/>
+          <Scale X="0.0500000119" Y="0.0500000119" Z="0.0500000119"/>
+          <Orientation X="-0.295679808" Y="-1.03809083" Z="-0.237101197"/>
         </c:Transform>
       </Components>
       <Children/>

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

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

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/ble

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="AnimationTests" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:SceneLight>
+      <Gamma>0.30000001192092896</Gamma>
+      <Exposure>3</Exposure>
+    </c:SceneLight>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Transform>
+          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
+          <Orientation X="0" Y="2.41300011" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:DirectionalLight>
+              <Intensity>0</Intensity>
+            </c:DirectionalLight>
+            <c:Model>
+              <Resource>Models/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Position X="0" Y="2.42800021" Z="-2.80000019"/>
+              <Orientation X="5.60000038" Y="3.14159203" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="1.32209361" Y="1.37392569" Z="-0.0505663045"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Assault">
+          <Components>
+            <c:BlendAdditive>
+              <Adder></Adder>
+              <Receiver></Receiver>
+            </c:BlendAdditive>
+            <c:Model>
+              <GlowIntensity>5</GlowIntensity>
+              <Resource>Models/Characters/Defender/DefenderBlue.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="AimBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>AimPrimary</Pose1>
+                  <Pose2>AimSecondary</Pose2>
+                  <Weight>0</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="AimPrimary">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName></AnimationName>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="AimSecondary">
+                  <Components>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Plane">
+          <Components>
+            <c:Model>
+              <Resource>Models/Core/UnitPlane.mesh</Resource>
+            </c:Model>
+            <c:Transform>
+              <Scale X="5" Y="1" Z="5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.956862748" G="0.960784316" R="0.819607854"/>
+              <Radius>8</Radius>
+              <Intensity>0.60000002384185791</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-1.36898434" Y="1.37392569" Z="0.620898128"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="Light">
+          <Components>
+            <c:PointLight>
+              <Radius>8</Radius>
+              <Intensity>0.80000001192092896</Intensity>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.127636135" Y="1.37392569" Z="-1.52101767"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/derp.xml

@@ -0,0 +1,298 @@
+<?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>Aim</Adder>
+      <Receiver>FinalBlend</Receiver>
+    </c:BlendAdditive>
+    <c:Model>
+      <GlowIntensity>4</GlowIntensity>
+      <Resource>Models/Characters/Sniper/SniperBlue.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>
+          <Position X="0.161506474" Y="1.12409711" Z="-0.197195739"/>
+          <Scale X="1.00000012" Y="1" Z="1.00000012"/>
+          <Orientation X="0.185420558" Y="-0.0891536027" Z="0.122916825"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Light">
+      <Components>
+        <c:PointLight>
+          <Radius>3</Radius>
+        </c:PointLight>
+        <c:Transform>
+          <Position X="0" Y="0.100000001" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Aim">
+      <Components>
+        <c:Animation>
+          <AnimationName>AimRifleA</AnimationName>
+          <Time>0.60000038146972656</Time>
+          <Loop>false</Loop>
+          <Additive>true</Additive>
+        </c:Animation>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="FinalBlend">
+      <Components>
+        <c:BlendOverride>
+          <Master>WeaponBlend</Master>
+          <Slave>MovementBlend</Slave>
+        </c:BlendOverride>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="WeaponBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>ShootBlend</Pose1>
+              <Pose2>Reload</Pose2>
+              <Weight>1</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="ShootBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>ShootFast</Pose1>
+                  <Pose2>ShootSlow</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="ShootFast">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShootFastRifleU</AnimationName>
+                      <Time>0.19319528378127959</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="ShootSlow">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>ShootRifleU</AnimationName>
+                      <Time>0.59328474141239074</Time>
+                      <Speed>1</Speed>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Reload">
+              <Components>
+                <c:Animation>
+                  <AnimationName>ReloadSwitchU</AnimationName>
+                  <Time>1</Time>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="MovementBlend">
+          <Components>
+            <c:Blend>
+              <Pose1>StandCrouchBlend</Pose1>
+              <Pose2>Jump</Pose2>
+              <Weight>1</Weight>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="StandCrouchBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>StandMovement</Pose1>
+                  <Pose2>CrouchMovement</Pose2>
+                  <Weight>1</Weight>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="CrouchMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>Walk</Pose1>
+                      <Pose2>StrafeBlend</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="Walk">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchWalkF</AnimationName>
+                          <Time>0.35684875796278082</Time>
+                          <Speed>1</Speed>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="StrafeBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Left</Pose1>
+                          <Pose2>Right</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Left">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchStrafeLeftF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Right">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchStrafeRightF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="StandMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>RunWalkBlend</Pose1>
+                      <Pose2>StrafeBlend</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="RunWalkBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Run</Pose1>
+                          <Pose2>Walk</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Run">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>RunF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>WalkF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="StrafeBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Left</Pose1>
+                          <Pose2>Right</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Left">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>StrafeLeftF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Right">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>StrafeRightF</AnimationName>
+                              <Time>0.35684875796278082</Time>
+                              <Speed>1</Speed>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Jump">
+              <Components>
+                <c:Animation>
+                  <AnimationName>JumpF</AnimationName>
+                  <Time>1</Time>
+                  <Loop>false</Loop>
+                </c:Animation>
+                <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/Types/Entity.xsd

@@ -43,10 +43,12 @@
 							<xs:element ref="c:Shield" minOccurs="0"/>
 							<xs:element ref="c:Shielded" minOccurs="0"/>
 							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>
+							<xs:element ref="c:BlendOverride" minOccurs="0"/>
 							<xs:element ref="c:TextFieldReader" minOccurs="0"/>
+							<xs:element ref="c:Blend" minOccurs="0"/>
+							<xs:element ref="c:BlendAdditive" minOccurs="0"/>
 							<xs:element ref="c:KillFeed" minOccurs="0"/>
 							<xs:element ref="c:Sprite" minOccurs="0"/>
-							<xs:element ref="c:AnimationOffset" minOccurs="0"/>
 							<xs:element ref="c:Menu" minOccurs="0"/>
 							<xs:element ref="c:Page" minOccurs="0"/>
 							<xs:element ref="c:Button" minOccurs="0"/>
@@ -64,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>

src/Engine/Core/EntityWrapper.cpp

@@ -51,6 +51,31 @@ EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
     return firstChildByNameRecursive(name, this->ID);
 }
 
+
+EntityWrapper EntityWrapper::FirstLevelChildByName(const std::string& name)
+{
+    EntityID parent = this->ID;
+    if (!this->World->ValidEntity(parent)) {
+        return EntityWrapper::Invalid;
+    }
+
+    auto itPair = this->World->GetDirectChildren(parent);
+    if (itPair.first == itPair.second) {
+        return EntityWrapper::Invalid;
+    }
+
+    for (auto it = itPair.first; it != itPair.second; ++it) {
+        std::string itName = this->World->GetName(it->second);
+        if (itName == name) {
+            return EntityWrapper(this->World, it->second);
+        } else if (it->second != EntityID_Invalid) {
+            continue;
+        }
+    }
+
+    return EntityWrapper::Invalid;
+}
+
 EntityWrapper EntityWrapper::FirstParentWithComponent(const std::string& componentType)
 {
     EntityWrapper entity = *this;

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/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,16 @@ 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();
 }
 
-PlayerID Server::GetPlayerIDFromEndpoint()
+PlayerID Server::getPlayerIDFromEndpoint()
 {
     // check both tcp and udp connection
     for (auto& kv : m_ConnectedPlayers) {
@@ -647,4 +670,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/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

@@ -1,71 +1,222 @@
 #include "Rendering/AnimationSystem.h"
 
-void AnimationSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt)
+AnimationSystem::AnimationSystem(SystemParams params)
+    : System(params)
 {
-    if(!entity.HasComponent("Model")) {
+    EVENT_SUBSCRIBE_MEMBER(m_EAutoAnimationBlend, &AnimationSystem::OnAutoAnimationBlend);
+}
+
+void AnimationSystem::Update(double dt)
+{
+    UpdateAnimations(dt);
+    CreateBlendTrees();
+    UpdateWeights(dt);
+
+
+    for(auto& autoBlendQueue : m_AutoBlendQueues) {
+        autoBlendQueue.second.UpdateTime(dt);
+    }
+}
+
+void AnimationSystem::CreateBlendTrees()
+{
+    auto modelComponents = m_World->GetComponents("Model");
+    if (modelComponents == nullptr) {
         return;
     }
 
-    Model* model;
-    try {
-        model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
-    } catch (const std::exception&) {
-        return;
+    for (auto& modelC : *modelComponents) {
+        EntityWrapper entity = EntityWrapper(m_World, modelC.EntityID);
+
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(entity["Model"]["Resource"]);
+        } catch (const std::exception&) {
+            continue;;
+        }
+
+        Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+        if (skeleton == nullptr) {
+            continue;
+        }
+
+        if (entity.HasComponent("Blend") || entity.HasComponent("BlendOverride") ||
+            entity.HasComponent("BlendAdditive") || entity.HasComponent("Animation"))
+        {
+            std::shared_ptr<BlendTree> blendTree = std::shared_ptr<BlendTree>(new BlendTree(entity, skeleton));
+
+            if(blendTree->IsValid()) {
+                skeleton->BlendTrees[entity] = blendTree;
+            }
+            
+        }
     }
-    
-    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
-    if(skeleton == nullptr) {
+}
+
+void AnimationSystem::UpdateAnimations(double dt)
+{
+    auto animationComponents = m_World->GetComponents("Animation");
+    if(animationComponents == nullptr) {
         return;
     }
 
-    for (int i = 1; i <= 3; i++) {
-        const Skeleton::Animation* animation = skeleton->GetAnimation(animationComponent["AnimationName" + std::to_string(i)]);
+    for (auto& animationC : *animationComponents) {
+        EntityWrapper entity = EntityWrapper(m_World, animationC.EntityID);
+        EntityWrapper modelEntity;
+        if(!entity.HasComponent("Model")) {
+            modelEntity = entity.FirstParentWithComponent("Model");
+        } else {
+            modelEntity = entity;
+        }
+
+        Model* model;
+        try {
+            model = ResourceManager::Load<::Model, true>(modelEntity["Model"]["Resource"]);
+        } catch (const std::exception&) {
+            return;
+        }
+
+        Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+        if (skeleton == nullptr) {
+            return;
+        }
+
+        const Skeleton::Animation* animation = skeleton->GetAnimation(animationC["AnimationName"]);
 
         if (animation == nullptr) {
             continue;;
         }
 
-        double animationSpeed = (double)animationComponent["Speed" + std::to_string(i)];
+        double animationSpeed = (double)animationC["Speed"];
 
-        if (animationSpeed != 0.0) {
-            double nextTime = (double)animationComponent["Time" + std::to_string(i)] + animationSpeed * dt;
+        if((bool)animationC["Reverse"]) {
+            animationSpeed *= -1;
+        }
 
 
-            if (!(bool)animationComponent["Loop" + std::to_string(i)]) {
+        if ((bool)animationC["Play"]) {
+
+            double nextTime = (double)animationC["Time"] + animationSpeed * dt;
+            if (!(bool)animationC["Loop"]) {
                 if (nextTime > animation->Duration) {
                     nextTime = animation->Duration;
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
+                    (bool&)animationC["Play"] = false;
                 } else if (nextTime < 0) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
                     nextTime = 0;
+                    (bool&)animationC["Play"] = false;
                 }
-
-                (double&)animationComponent["Speed" + std::to_string(i)] = 0.0;
-                
             } else {
                 if (nextTime > animation->Duration) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
-                    nextTime -= animation->Duration;
+
+                    while (nextTime > animation->Duration) {
+                        nextTime -= animation->Duration;
+                    }
                 } else if (nextTime < 0) {
-                    Events::AnimationComplete e;
-                    e.Entity = entity;
-                    e.Name = (std::string)animationComponent["AnimationName" + std::to_string(i)];
-                    m_EventBroker->Publish(e);
-                    nextTime += animation->Duration;
+                    while (nextTime < 0) {
+                        nextTime += animation->Duration;
+                    }
                 }
             }
-
-            (double&)animationComponent["Time" + std::to_string(i)] = nextTime;
+            (double&)animationC["Time"] = nextTime;
         }
-    } 
+    }
 }
 
+
+void AnimationSystem::UpdateWeights(double dt)
+{
+    for (auto& autoBlendQueue : m_AutoBlendQueues) {
+
+        if(autoBlendQueue.second.HasActiveBlendJob()) {
+            AutoBlendQueue::AutoBlendJob& blendJob = autoBlendQueue.second.GetActiveBlendJob();
+
+            std::shared_ptr<BlendTree> blendTree = autoBlendQueue.second.GetBlendTree();
+
+            if (blendTree != nullptr) {
+                if (blendJob.Duration != 0.0) {
+                    blendJob.BlendInfo.progress = glm::clamp(blendJob.CurrentTime / blendJob.Duration, 0.0, 1.0);
+                } else {
+                    blendJob.BlendInfo.progress = 1.0;
+                }
+
+                blendJob.BlendInfo = blendTree->AutoBlendStep(blendJob.BlendInfo);
+            }
+
+        }
+
+    }
+}
+
+bool AnimationSystem::OnAutoAnimationBlend(Events::AutoAnimationBlend& e)
+{
+
+    if (!e.RootNode.Valid()) {
+        return false;
+    }
+
+    if (!e.RootNode.HasComponent("Model")) {
+        return false;
+    }
+
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>((std::string)e.RootNode["Model"]["Resource"]);
+    } catch (const std::exception&) {
+        return false;
+    }
+
+    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+    if (skeleton == nullptr) {
+        return false;
+    }
+
+    std::shared_ptr<BlendTree> blendTree;
+    if (skeleton->BlendTrees.find(e.RootNode) != skeleton->BlendTrees.end()) {
+        blendTree = skeleton->BlendTrees.at(e.RootNode);
+    } else {
+        return false;
+    }
+
+
+
+    EntityWrapper subTreeRoot = blendTree->GetSubTreeRoot(e.NodeName);
+
+    if (!subTreeRoot.Valid()) {
+        return false;
+    }
+
+    AutoBlendQueue::AutoBlendJob abj;
+    abj.AnimationEntity = e.AnimationEntity;
+    abj.CurrentTime = 0.0;
+    abj.Delay = e.Delay;
+    abj.Duration = e.Duration;
+    abj.RootNode = e.RootNode;
+
+    abj.BlendInfo.NodeName = e.NodeName;
+    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()) {
+        if (nodeEntity.HasComponent("Animation")) {
+            const Skeleton::Animation* animation = skeleton->GetAnimation(nodeEntity["Animation"]["AnimationName"]);
+            (bool&)nodeEntity["Animation"]["Reverse"] = e.Reverse;
+
+            if (e.Restart) {
+                if (animation != nullptr) {
+                    if (e.Restart) {
+                        if (e.Reverse) {
+                            (double&)nodeEntity["Animation"]["Time"] = animation->Duration;
+                        } else {
+                            (double&)nodeEntity["Animation"]["Time"] = 0.0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    m_AutoBlendQueues[subTreeRoot].Insert(abj);
+    return true;
+}

src/Engine/Rendering/AutoBlendQueue.cpp

@@ -0,0 +1,195 @@
+#include "Rendering/AutoBlendQueue.h"
+
+void AutoBlendQueue::Insert(AutoBlendJob autoBlendJob)
+{
+    if(!autoBlendJob.RootNode.HasComponent("Model")) {
+        return;
+    }
+
+    AutoblendNode blendNode;
+    blendNode.BlendJob = autoBlendJob;
+    blendNode.StartTime = autoBlendJob.Delay;
+    blendNode.EndTime = autoBlendJob.Delay + autoBlendJob.Duration;
+
+
+
+    if (autoBlendJob.AnimationEntity.Valid()) {
+        if (autoBlendJob.AnimationEntity.HasComponent("Animation")) {
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>((std::string)autoBlendJob.RootNode["Model"]["Resource"]);
+            } catch (const std::exception&) {
+                return;
+            }
+
+            Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+            if (skeleton == nullptr) {
+                return;
+            }
+
+            const Skeleton::Animation* animation = skeleton->GetAnimation((std::string)autoBlendJob.AnimationEntity["Animation"]["AnimationName"]);
+
+            if (animation == nullptr) {
+                return;
+            }
+
+            double AnimationDuration = 0.0;
+
+            double animationSpeed = (double)autoBlendJob.AnimationEntity["Animation"]["Speed"];
+            double animationTime = (double)autoBlendJob.AnimationEntity["Animation"]["Time"];
+
+
+            if ((bool)autoBlendJob.AnimationEntity["Animation"]["Reverse"]) {
+                AnimationDuration = (animation->Duration * animationSpeed) - (animation->Duration - animationTime);
+            } else {
+                AnimationDuration = (animation->Duration * animationSpeed) - animationTime;
+            }
+
+            blendNode.StartTime += AnimationDuration;
+            blendNode.EndTime += AnimationDuration;
+            if (m_BlendQueue.size() == 0) {
+                m_BlendQueue.push_back(blendNode);
+            } else {
+                for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end(); it++) {
+                    auto next = std::next(it, 1);
+
+
+                    if (it->BlendJob.BlendInfo.NodeName == autoBlendJob.BlendInfo.NodeName) {
+                        (*it) = blendNode;
+                    }
+
+                    if (next != m_BlendQueue.end()) {
+                        if (it->StartTime >= blendNode.StartTime && next->StartTime <= blendNode.StartTime) {
+                            m_BlendQueue.insert(next, blendNode);
+                            return;
+                        }
+                    } else if(it->StartTime > blendNode.StartTime){
+                        m_BlendQueue.push_front(blendNode);
+                        return;
+                    } else if (it->StartTime <= blendNode.StartTime) {
+                        m_BlendQueue.push_back(blendNode);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+
+    m_BlendQueue.clear();
+    m_BlendQueue.push_back(blendNode);
+}
+
+void AutoBlendQueue::UpdateTime(double dt)
+{
+    for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end();) {
+        if (it->EndTime <= 0) {
+            it = m_BlendQueue.erase(it);
+        } else {
+            it->EndTime -= dt;
+            it->StartTime -= dt;
+            it++;
+        }
+    }
+}
+
+void AutoBlendQueue::PrintQueue()
+{
+    for (auto it = m_BlendQueue.begin(); it != m_BlendQueue.end(); it++) {
+        LOG_INFO("Start: %f End: %f \t %s", it->StartTime, it->EndTime, it->BlendJob.BlendInfo.NodeName.c_str());
+    }
+}
+
+
+bool AutoBlendQueue::HasActiveBlendJob()
+{
+    if(m_BlendQueue.empty()) {
+        return false;
+    } else {
+        AutoblendNode blendNode = m_BlendQueue.front();
+        if (blendNode.StartTime <= 0) {
+            AutoBlendJob blendJob = blendNode.BlendJob;
+
+            if (!blendJob.RootNode.Valid()) {
+                m_BlendQueue.pop_front();
+                return false;
+            }
+
+            if (!blendJob.RootNode.HasComponent("Model")) {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            Model* model;
+            try {
+                model = ResourceManager::Load<::Model, true>(blendJob.RootNode["Model"]["Resource"]);
+            } catch (const std::exception&) {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+            if (skeleton == nullptr) {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+
+            if (skeleton->BlendTrees.find(blendJob.RootNode) != skeleton->BlendTrees.end()) {
+                return true;
+            } else {
+                m_BlendQueue.pop_front();
+                return HasActiveBlendJob();
+            }
+
+            
+        } else {
+            return false;
+        }
+    }
+}
+
+
+std::shared_ptr<BlendTree> AutoBlendQueue::GetBlendTree()
+{
+    AutoblendNode blendNode = m_BlendQueue.front();
+    AutoBlendJob blendJob = blendNode.BlendJob;
+
+    if (!blendJob.RootNode.Valid()) {
+        m_BlendQueue.pop_front();
+        return false;
+    }
+
+    if (!blendJob.RootNode.HasComponent("Model")) {
+        return nullptr;
+    }
+
+    Model* model;
+    try {
+        model = ResourceManager::Load<::Model, true>(blendJob.RootNode["Model"]["Resource"]);
+    } catch (const std::exception&) {
+        return nullptr;
+    }
+
+    Skeleton* skeleton = model->m_RawModel->m_Skeleton;
+    if (skeleton == nullptr) {
+        return nullptr;
+    }
+
+
+    if (skeleton->BlendTrees.find(blendJob.RootNode) != skeleton->BlendTrees.end()) {
+        return skeleton->BlendTrees.at(blendJob.RootNode);
+    } else {
+        return nullptr;
+    }
+
+
+
+}
+
+AutoBlendQueue::AutoBlendJob& AutoBlendQueue::GetActiveBlendJob()
+{
+    AutoblendNode& blendNode = m_BlendQueue.front();
+    blendNode.BlendJob.CurrentTime = -blendNode.StartTime;
+    return blendNode.BlendJob;
+}

src/Engine/Rendering/BlendTree.cpp

@@ -0,0 +1,499 @@
+#include "Rendering/BlendTree.h"
+
+BlendTree::BlendTree(EntityWrapper ModelEntity, Skeleton* skeleton)
+{
+
+    m_Skeleton = skeleton;
+
+
+
+    if (ModelEntity.HasComponent("Animation")) {
+        const Skeleton::Animation* animation = skeleton->GetAnimation(ModelEntity["Animation"]["AnimationName"]);
+        if (animation == nullptr) {
+            return;
+        }
+
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Pose = m_Skeleton->GetFrameBones(animation, (double)ModelEntity["Animation"]["Time"], (bool)ModelEntity["Animation"]["Additive"]);
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Animation;
+
+    } else if (ModelEntity.HasComponent("Blend")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Blend;
+        m_Root->Weight = (double)ModelEntity["Blend"]["Weight"];
+        m_Root->SubTreeRoot = (bool)ModelEntity["Blend"]["SubTreeRoot"];
+        (double&)ModelEntity["Blend"]["Weight"] = glm::clamp((double)ModelEntity["Blend"]["Weight"], 0.0, 1.0);
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["Blend"]["Pose1"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["Blend"]["Pose2"], ModelEntity);
+
+    } else if (ModelEntity.HasComponent("BlendOverride")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Override;
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendOverride"]["Master"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendOverride"]["Slave"], ModelEntity);
+
+    } else if (ModelEntity.HasComponent("BlendAdditive")) {
+        m_Root = new Node();
+        m_Root->Entity = ModelEntity;
+        m_Root->Name = ModelEntity.Name();
+        m_Root->Parent = nullptr;
+        m_Root->Type = NodeType::Additive;
+        m_Root->Child[0] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendAdditive"]["Adder"], ModelEntity);
+        m_Root->Child[1] = FillTreeByName(m_Root, (std::string)ModelEntity["BlendAdditive"]["Receiver"], ModelEntity);
+    }
+
+    m_FinalPose = AccumulateFinalPose();
+   // PrintTree();
+}
+
+BlendTree::~BlendTree()
+{
+    Node* currentNode = m_Root;
+    if (currentNode != nullptr) {
+        while (currentNode->Child[0] != nullptr) {
+            currentNode = currentNode->Child[0];
+        }
+
+        std::list<Node*> m_NodesToRemove;
+
+        while (currentNode != nullptr) {
+            m_NodesToRemove.push_back(currentNode);
+            currentNode = currentNode->Next();
+        }
+
+        for (auto it = m_NodesToRemove.begin(); it != m_NodesToRemove.end(); it++) {
+            delete (*it);
+        }
+    }
+}
+
+
+glm::mat4 BlendTree::GetBoneTransform(int boneID)
+{
+    if(m_FinalBoneTransforms.find(boneID) != m_FinalBoneTransforms.end()) {
+        return m_FinalBoneTransforms.at(boneID);
+    } else {
+        return glm::mat4(1);
+    }
+    
+}
+
+void BlendTree::PrintTree()
+{
+    Node* currentNode = m_Root;
+    LOG_INFO("\n\n");
+
+    while(currentNode->Child[0] != nullptr) {
+        currentNode = currentNode->Child[0];
+    }
+
+    while (currentNode != nullptr)
+    {
+        LOG_INFO("%s", currentNode->Name.c_str());
+        currentNode = currentNode->Next();
+    }
+}
+
+BlendTree::Node* BlendTree::FillTreeByName(Node* parentNode, std::string name, EntityWrapper parentEntity)
+{
+    EntityWrapper childEntity = parentEntity.FirstLevelChildByName(name); // Make first level child by name
+
+    if (!childEntity.Valid()) {
+        return nullptr;
+    }
+
+    if (childEntity.HasComponent("Animation")) {
+        const Skeleton::Animation* animation = m_Skeleton->GetAnimation(childEntity["Animation"]["AnimationName"]);
+        if (animation == nullptr) {
+            return nullptr;
+        }
+
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Pose = m_Skeleton->GetFrameBones(animation, (double)childEntity["Animation"]["Time"], (bool)childEntity["Animation"]["Additive"]);
+        node->Parent = parentNode;
+        node->Type = NodeType::Animation;
+        return node;
+
+    } else if (childEntity.HasComponent("Blend")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Blend;
+        (double&)childEntity["Blend"]["Weight"] = glm::clamp((double)childEntity["Blend"]["Weight"], 0.0, 1.0);
+        node->Weight = (double)childEntity["Blend"]["Weight"];
+        node->SubTreeRoot = (bool)childEntity["Blend"]["SubTreeRoot"];
+        //if (node->Weight < 1.f && node->Weight > 0.f) {
+            node->Child[0] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose1"], childEntity);
+            node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity);
+       /* } else if (node->Weight == 1.f) {
+            node->Child[0] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose1"], childEntity);
+        } else if (node->Weight == 0.f) {
+            node->Child[1] = FillTreeByName(node, (std::string)childEntity["Blend"]["Pose2"], childEntity);
+        }*/
+        
+        if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+
+    } else if (childEntity.HasComponent("BlendOverride")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Override;
+        node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Master"], childEntity);
+        node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendOverride"]["Slave"], childEntity);
+        
+        if (node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+    } else if (childEntity.HasComponent("BlendAdditive")) {
+        Node* node = new Node();
+        node->Entity = childEntity;
+        node->Name = childEntity.Name();
+        node->Parent = parentNode;
+        node->Type = NodeType::Additive;
+        node->Child[0] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Adder"], childEntity);
+        node->Child[1] = FillTreeByName(node, (std::string)childEntity["BlendAdditive"]["Receiver"], childEntity);
+        
+        if(node->Child[0] == nullptr && node->Child[1] == nullptr) {
+            return nullptr;
+        } else {
+            return node;
+        }
+    }
+    
+
+    return nullptr;
+}
+
+
+std::vector<BlendTree::Node*> BlendTree::FindNodesByName(std::string name)
+{
+    std::vector<Node*> Nodes;
+    Node* currentNode = m_Root;
+
+    while (currentNode->Child[0] != nullptr) {
+        currentNode = currentNode->Child[0];
+    }
+
+    while (currentNode != nullptr) {
+        if(currentNode->Name == name) {
+            Nodes.push_back(currentNode);
+        }
+        currentNode = currentNode->Next();
+    }
+    return Nodes;
+}
+
+
+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;
+
+            if (entity.Valid()) {
+                if (entity.HasComponent("Animation")) {
+                    (bool&)entity["Animation"]["Play"] = true;
+                }
+            }
+        }
+    }
+
+    if(goalNodes.size() == 0) {
+        return blendInfo;
+    } else if(goalNodes.size() == 1) {
+        Node* currentNode = goalNodes[0]->Parent;
+        Node* lastNode = goalNodes[0];
+
+        while (currentNode != nullptr)
+        {
+            if(!currentNode->Entity.HasComponent("Blend")) {
+                return blendInfo;
+            }
+
+            double startWeight;
+            if(blendInfo.StartWeights.find(currentNode->Entity) != blendInfo.StartWeights.end()) {
+                startWeight = blendInfo.StartWeights.at(currentNode->Entity);
+            } else {
+                startWeight = currentNode->Weight;
+                blendInfo.StartWeights[currentNode->Entity] = startWeight;
+            }
+
+            double goalWeight;
+            if(currentNode->Child[0] == lastNode) {
+                goalWeight = 0.0;
+            } else if (currentNode->Child[1] == lastNode) {
+                goalWeight = 1.0;
+            }
+
+            double weight = ((goalWeight - startWeight) * blendInfo.progress) + startWeight;
+            (double&)currentNode->Entity["Blend"]["Weight"] = weight;
+            currentNode->Weight = weight;
+
+            lastNode = currentNode;
+            currentNode = currentNode->Parent;
+
+            if (blendInfo.SingleBlend) {
+                break;
+            }
+        }
+    } else if(goalNodes.size() >= 2) {
+        std::vector<Node*> sharedParents;
+        std::vector<Node*> nodes = goalNodes;
+
+        for (auto it = nodes.begin(); it != nodes.end(); it++) {
+            auto next = std::next(it, 1);
+            if (next != nodes.end()) {
+                Node* commonParent = FirstCommonParent((*it), (*next));
+                sharedParents.push_back(commonParent);
+                (*next) = commonParent;
+                nodes.erase(it);
+                it = nodes.begin();
+            }
+        }
+
+
+        for (auto it = goalNodes.begin(); it != goalNodes.end(); it++) {
+
+            Node* currentNode = (*it)->Parent;
+            Node* lastNode = (*it);
+
+            while (currentNode != nullptr) {
+                if (!currentNode->Entity.HasComponent("Blend")) {
+                    return blendInfo;
+                }
+
+                bool ShouldBreak = false;
+                for (auto it = sharedParents.begin(); it != sharedParents.end(); it++) {
+                    if(currentNode == (*it)) {
+                        ShouldBreak = true;
+                    }
+                }
+
+                if(ShouldBreak) {
+                    break;
+                }
+
+                double startWeight;
+                if (blendInfo.StartWeights.find(currentNode->Entity) != blendInfo.StartWeights.end()) {
+                    startWeight = blendInfo.StartWeights.at(currentNode->Entity);
+                } else {
+                    startWeight = currentNode->Weight;
+                    blendInfo.StartWeights[currentNode->Entity] = startWeight;
+                }
+
+                double goalWeight;
+                if (currentNode->Child[0] == lastNode) {
+                    goalWeight = 0.0;
+                } else if (currentNode->Child[1] == lastNode) {
+                    goalWeight = 1.0;
+                }
+
+                double weight = ((goalWeight - startWeight) * blendInfo.progress) + startWeight;
+                (double&)currentNode->Entity["Blend"]["Weight"] = weight;
+                currentNode->Weight = weight;
+
+                lastNode = currentNode;
+                currentNode = currentNode->Parent;
+            }
+        }
+
+    }
+
+    return blendInfo;
+}
+
+BlendTree::Node* BlendTree::GetCommonParent(std::string NodeName1, std::string NodeName2)
+{
+    std::vector<Node*> nodes1 = FindNodesByName(NodeName1);
+    std::vector<Node*> nodes2 = FindNodesByName(NodeName2);
+
+    for (auto it = nodes1.begin(); it != nodes1.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if(next != nodes1.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            nodes1.erase(it);
+            it = nodes1.begin();
+        }
+    }
+
+    for (auto it = nodes2.begin(); it != nodes2.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if (next != nodes2.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            nodes2.erase(it);
+            it = nodes2.begin();
+        }
+    }
+
+    return FirstCommonParent(nodes1.front(), nodes2.front());;
+}
+
+
+BlendTree::Node* BlendTree::FirstCommonParent(Node* node1, Node* node2)
+{
+    std::list<Node*> node1Parents;
+
+    Node* currentNode = node1;
+    while (currentNode != nullptr) {
+        node1Parents.push_back(currentNode);
+        currentNode = currentNode->Parent;
+    }
+
+    currentNode = node2;
+    while (currentNode != nullptr) {
+        for (auto it = node1Parents.begin(); it != node1Parents.end(); it++) {
+            if (currentNode == (*it)) {
+                return currentNode;
+            }
+        }
+        currentNode = currentNode->Parent;
+    }
+
+    return nullptr;
+}
+
+
+EntityWrapper BlendTree::GetSubTreeRoot(std::string nodeName)
+{
+    std::vector<Node*> nodes = FindNodesByName(nodeName);
+
+    if (nodes.size() == 0) {
+        return EntityWrapper::Invalid;
+    }
+
+    std::vector<Node*> subTreeRoots;
+
+    for (auto it = nodes.begin(); it != nodes.end(); it++) {
+        Node* currentNode = (*it)->Parent;
+        while (!currentNode->SubTreeRoot) {
+            currentNode = currentNode->Parent;
+        }
+        subTreeRoots.push_back(currentNode);
+    }
+
+
+    for (auto it = subTreeRoots.begin(); it != subTreeRoots.end(); it++) {
+        auto next = std::next(it, 1);
+
+        if (next != subTreeRoots.end()) {
+            Node* commonParent = FirstCommonParent((*it), (*next));
+            (*next) = commonParent;
+            subTreeRoots.erase(it);
+            it = subTreeRoots.begin();
+        }
+    }
+
+    return subTreeRoots.front()->Entity;
+}
+
+void BlendTree::Blend(std::map<int, Skeleton::PoseData>& pose)
+{
+    Node* currentNode;
+    Node* start = m_Root;
+    while (start->Child[0] != nullptr) {
+        start = start->Child[0];
+    }
+
+    currentNode = start;
+
+    while (m_Root->Pose.size() == 0) {
+        if(currentNode->Pose.size() == 0) {
+            if (currentNode->Child[0] != nullptr && currentNode->Child[1] != nullptr) {
+                if (currentNode->Child[0]->Pose.size() != 0 && currentNode->Child[1]->Pose.size() != 0) {
+                    switch (currentNode->Type) {
+                    case BlendTree::NodeType::Additive:
+                        currentNode->Pose = m_Skeleton->BlendPoseAdditive(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose);
+                        break;
+                    case BlendTree::NodeType::Blend:
+                        currentNode->Pose = m_Skeleton->BlendPoses(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose, currentNode->Weight);
+                        break;
+                    case BlendTree::NodeType::Override:
+                        currentNode->Pose = m_Skeleton->OverridePose(currentNode->Child[0]->Pose, currentNode->Child[1]->Pose);
+                        break;
+                    case BlendTree::NodeType::Animation:
+                        // do nothing
+                        break;
+                    } 
+                } 
+            } else if (currentNode->Child[0] != nullptr) {
+                if (currentNode->Child[0]->Pose.size() != 0) {
+                    currentNode->Pose = currentNode->Child[0]->Pose;
+                }
+            } else if (currentNode->Child[1] != nullptr) {
+                if (currentNode->Child[1]->Pose.size() != 0) {
+                    currentNode->Pose = currentNode->Child[1]->Pose;
+                }
+            }
+        } 
+
+        currentNode = currentNode->Next();
+
+        if (currentNode == nullptr) {
+            currentNode = start;
+        }
+        
+    }
+
+    pose = m_Root->Pose;
+}
+
+std::vector<glm::mat4> BlendTree::AccumulateFinalPose()
+{
+    std::vector<glm::mat4> finalPose;
+    if (m_Skeleton == nullptr || m_Root == nullptr || (m_Root->Child[0] == nullptr && m_Root->Child[1] == nullptr)) {
+        
+        for (int i = 0; i < m_Skeleton->Bones.size(); i++) {
+            finalPose.push_back(glm::mat4(1));
+        }
+        return finalPose;
+    }
+
+    std::map<int, Skeleton::PoseData> pose;
+    Blend(pose);
+
+    m_Skeleton->GetFinalPose(pose, finalPose, m_FinalBoneTransforms);
+
+    return finalPose;
+}
+

src/Engine/Rendering/BoneAttachmentSystem.cpp

@@ -8,10 +8,13 @@ void BoneAttachmentSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
         return;
     }
 
-    auto parent = entity.FirstParentWithComponent("Animation");
-    if (!parent.HasComponent("Model")) {
+    auto parent = entity.FirstParentWithComponent("Model");
+
+    if(!parent.Valid()) {
         return;
     }
+
+
     Model* model;
     try {
         model = ResourceManager::Load<::Model, true>(parent["Model"]["Resource"]);
@@ -35,66 +38,29 @@ void BoneAttachmentSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
         return;
     }
 
-    std::vector<::Skeleton::AnimationData> Animations;
-    ::Skeleton::AnimationOffset AnimationOffset;
-    glm::mat4 boneTransform;
+    if (skeleton->BlendTrees.find(parent) != skeleton->BlendTrees.end()) {
 
-    if (parent.HasComponent("Animation")) {
-        for (int i = 1; i <= 3; i++) {
-            ::Skeleton::AnimationData animationData;
-            animationData.animation = model->m_RawModel->m_Skeleton->GetAnimation(parent["Animation"]["AnimationName" + std::to_string(i)]);
-            if (animationData.animation == nullptr) {
-                continue;
-            }
-            animationData.time = (double)parent["Animation"]["Time" + std::to_string(i)];
-            animationData.weight = (double)parent["Animation"]["Weight" + std::to_string(i)];
 
-            Animations.push_back(animationData);
-        }
-    }
+        glm::mat4 boneTransform = skeleton->BlendTrees.at(parent)->GetBoneTransform(id);
 
-    if (parent.HasComponent("AnimationOffset")) {
-        AnimationOffset.animation = model->m_RawModel->m_Skeleton->GetAnimation(parent["AnimationOffset"]["AnimationName"]);
-        AnimationOffset.time = (double)parent["AnimationOffset"]["Time"];
+        glm::vec3 scale;
+        glm::quat rotation;
+        glm::vec3 translation;
+        glm::vec3 skew;
+        glm::vec4 perspective;
+        glm::decompose(boneTransform, scale, rotation, translation, skew, perspective);
 
-        if(AnimationOffset.animation != nullptr) {
-            boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, AnimationOffset, glm::mat4(1));
-        } else {
-            boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, glm::mat4(1));
-        }
+        glm::vec3 angles = glm::vec3(-glm::pitch(rotation), -glm::yaw(rotation), -glm::roll(rotation));
         
-    } else {
-        boneTransform = skeleton->GetBoneTransform(false, skeleton->Bones.at(id), Animations, glm::mat4(1));
+        if ((bool)entity["BoneAttachment"]["InheritPosition"]) {
+            (glm::vec3&)entity["Transform"]["Position"] = translation + (glm::vec3)entity["BoneAttachment"]["PositionOffset"];
+        }
+        if ((bool)entity["BoneAttachment"]["InheritOrientation"]) {
+            (glm::vec3&)entity["Transform"]["Orientation"] = angles  + (glm::vec3)entity["BoneAttachment"]["OrientationOffset"];
+        }
+        if ((bool)entity["BoneAttachment"]["InheritScale"]) {
+            (glm::vec3&)entity["Transform"]["Scale"] = scale  * (glm::vec3)entity["BoneAttachment"]["ScaleOffset"];
+        }
     }
-    
-    
 
-    glm::vec3 scale;
-    glm::quat rotation;
-    glm::vec3 translation;
-    glm::vec3 skew;
-    glm::vec4 perspective;
-    glm::decompose(boneTransform, scale, rotation, translation, skew, perspective);
-
-    glm::vec3 angles = glm::vec3(-glm::pitch(rotation), -glm::yaw(rotation), -glm::roll(rotation));
-/*
-
-    angles.y = asin(-boneTransform[0][2]);
-    if (cos(angles.y) != 0) {
-        angles.x = atan2(boneTransform[1][2], boneTransform[2][2]);
-        angles.z = atan2(boneTransform[0][1], boneTransform[0][0]);
-    } else {
-        angles.x = atan2(-boneTransform[2][0], boneTransform[1][1]);
-        angles.z = 0;
-    }*/
-
-    if ((bool)entity["BoneAttachment"]["InheritPosition"]) {
-        (glm::vec3&)entity["Transform"]["Position"] = translation + (glm::vec3)entity["BoneAttachment"]["PositionOffset"];
-    }
-    if ((bool)entity["BoneAttachment"]["InheritOrientation"]) {
-        (glm::vec3&)entity["Transform"]["Orientation"] = angles  + (glm::vec3)entity["BoneAttachment"]["OrientationOffset"];
-    }
-    if ((bool)entity["BoneAttachment"]["InheritScale"]) {
-        (glm::vec3&)entity["Transform"]["Scale"] = scale  * (glm::vec3)entity["BoneAttachment"]["ScaleOffset"];
-    }
 }

src/Engine/Rendering/DrawBloomPass.cpp

@@ -45,6 +45,7 @@ void DrawBloomPass::InitializeShaderPrograms()
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
 		m_GaussianProgram_horiz->Compile();
+        m_GaussianProgram_horiz->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_horiz->Link();
 	}
 
@@ -53,6 +54,7 @@ void DrawBloomPass::InitializeShaderPrograms()
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
 		m_GaussianProgram_vert->Compile();
+        m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_vert->Link();
 	}
 }

src/Engine/Rendering/DrawFinalPass.cpp

@@ -350,27 +350,28 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
             case RawModel::MaterialType::Basic:
 			case RawModel::MaterialType::SingleTextures:
 				{
-					if (explosionEffectJob->Model->IsSkinned()) {
+                    if (explosionEffectJob->Model->IsSkinned()) {
 
-						m_ExplosionEffectSkinnedProgram->Bind();
-						GLERROR("Bind ExplosionEffectSkinned program");
-						//bind uniforms
-						BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
-						//bind textures
-						BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
-						glActiveTexture(GL_TEXTURE5);
-						glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
-						glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
+                        m_ExplosionEffectSkinnedProgram->Bind();
+                        GLERROR("Bind ExplosionEffectSkinned program");
+                        //bind uniforms
+                        BindExplosionUniforms(explosionSkinnedHandle, explosionEffectJob, scene);
+                        //bind textures
+                        BindExplosionTextures(explosionSkinnedHandle, explosionEffectJob);
+                        glActiveTexture(GL_TEXTURE5);
+                        glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
+                        glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-						std::vector<glm::mat4> frameBones;
-						if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-						}
-						else {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-					}
+                        std::vector<glm::mat4> frameBones;
+                        if (explosionEffectJob->BlendTree != nullptr) {
+                            frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = explosionEffectJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+
+                    }
 					else {
 						m_ExplosionEffectProgram->Bind();
 						GLERROR("Bind ExplosionEffect program");
@@ -386,23 +387,23 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 			}
 			case RawModel::MaterialType::SplatMapping:
 				{
-					if (explosionEffectJob->Model->IsSkinned()) {
-						m_ExplosionEffectSplatMapSkinnedProgram->Bind();
-						GLERROR("Bind ExplosionEffectSplatMapSkinned program");
-						//bind uniforms
-						BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
-						//bind textures
-						BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
-						GLERROR("asdasd");
-						std::vector<glm::mat4> frameBones;
-						if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-						}
-						else {
-							frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-					}
+                    if (explosionEffectJob->Model->IsSkinned()) {
+                        m_ExplosionEffectSplatMapSkinnedProgram->Bind();
+                        GLERROR("Bind ExplosionEffectSplatMapSkinned program");
+                        //bind uniforms
+                        BindExplosionUniforms(explosionSplatMapSkinnedHandle, explosionEffectJob, scene);
+                        //bind textures
+                        BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
+                        GLERROR("asdasd");
+                        std::vector<glm::mat4> frameBones;
+                        if (explosionEffectJob->BlendTree != nullptr) {
+                            frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = explosionEffectJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                    }
 					else {
 						m_ExplosionEffectSplatMapProgram->Bind();
 						GLERROR("Bind ExplosionEffectSplatMap program");
@@ -443,17 +444,15 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 						glActiveTexture(GL_TEXTURE5);
 						glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 						glUniform3fv(glGetUniformLocation(forwardSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
-
-						std::vector<glm::mat4> frameBones;
-						if (modelJob->AnimationOffset.animation != nullptr) {
-							frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-						}
-						else {
-							frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
-					}
+                            
+                        std::vector<glm::mat4> frameBones;
+                        if (modelJob->BlendTree != nullptr) {
+                            frameBones = modelJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = modelJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                    }
 					else {
 						m_ForwardPlusProgram->Bind();
 						GLERROR("Bind ForwardPlusProgram");
@@ -477,14 +476,13 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 						//bind textures
 						BindModelTextures(forwardSplatMapSkinnedHandle, modelJob);
 						GLERROR("asdasd");
-						std::vector<glm::mat4> frameBones;
-						if (modelJob->AnimationOffset.animation != nullptr) {
-							frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-						}
-						else {
-							frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-						}
-						glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                        std::vector<glm::mat4> frameBones;
+                        if (modelJob->BlendTree != nullptr) {
+                            frameBones = modelJob->BlendTree->GetFinalPose();
+                        } else {
+                            frameBones = modelJob->Skeleton->GetTPose();
+                        }
+                        glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 					}
 					else {
@@ -561,14 +559,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 							glUniform3fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
 						}
 						else {
 							m_ExplosionEffectShieldCheckProgram->Bind();
@@ -594,14 +592,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							//bind textures
 							BindExplosionTextures(explosionSplatMapSkinnedShieldCheckHandle, explosionEffectJob);
 							GLERROR("asdasd");
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 						}
 						else {
@@ -634,15 +632,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 							glUniform3fv(glGetUniformLocation(explosionSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-						}
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                        }
 						else {
 							m_ExplosionEffectProgram->Bind();
 							GLERROR("Bind ExplosionEffect program");
@@ -666,14 +663,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 							//bind textures
 							BindExplosionTextures(explosionSplatMapSkinnedHandle, explosionEffectJob);
 							GLERROR("asdasd");
-							std::vector<glm::mat4> frameBones;
-							if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
-							}
-							else {
-								frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
-							}
-							glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                            std::vector<glm::mat4> frameBones;
+                            if (explosionEffectJob->BlendTree != nullptr) {
+                                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
+                            } else {
+                                frameBones = explosionEffectJob->Skeleton->GetTPose();
+                            }
+                            glUniformMatrix4fv(glGetUniformLocation(explosionSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
 						}
 						else {
 							m_ExplosionEffectSplatMapProgram->Bind();
@@ -718,14 +715,13 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 								glUniform3fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-								std::vector<glm::mat4> frameBones;
-								if (modelJob->AnimationOffset.animation != nullptr) {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-								}
-								else {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-								}
-								glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                                std::vector<glm::mat4> frameBones;
+                                if (modelJob->BlendTree != nullptr) {
+                                    frameBones = modelJob->BlendTree->GetFinalPose();
+                                } else {
+                                    frameBones = modelJob->Skeleton->GetTPose();
+                                }
+                                glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 							}
 							else {
@@ -751,15 +747,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								//bind textures
 								BindModelTextures(forwardSplatMapSkinnedShieldCheckHandle, modelJob);
 								GLERROR("asdasd");
-								std::vector<glm::mat4> frameBones;
-								if (modelJob->AnimationOffset.animation != nullptr) {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-								}
-								else {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-								}
-								glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
+                                std::vector<glm::mat4> frameBones;
+                                if (modelJob->BlendTree != nullptr) {
+                                    frameBones = modelJob->BlendTree->GetFinalPose();
+                                } else {
+                                    frameBones = modelJob->Skeleton->GetTPose();
+                                }
+                                glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedShieldCheckHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
 								m_ForwardPlusSplatMapShieldCheckProgram->Bind();
@@ -789,14 +784,13 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								glBindTexture(GL_TEXTURE_CUBE_MAP, m_CubeMapPass->m_CubeMapTexture);
 								glUniform3fv(glGetUniformLocation(forwardSkinnedHandle, "CameraPosition"), 1, glm::value_ptr(scene.Camera->Position()));
 
-								std::vector<glm::mat4> frameBones;
-								if (modelJob->AnimationOffset.animation != nullptr) {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-								}
-								else {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-								}
-								glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                                std::vector<glm::mat4> frameBones;
+                                if (modelJob->BlendTree != nullptr) {
+                                    frameBones = modelJob->BlendTree->GetFinalPose();
+                                } else {
+                                    frameBones = modelJob->Skeleton->GetTPose();
+                                }
+                                glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 							}
 							else {
@@ -822,15 +816,14 @@ void DrawFinalPass::DrawModelRenderQueuesWithShieldCheck(std::list<std::shared_p
 								//bind textures
 								BindModelTextures(forwardSplatMapSkinnedHandle, modelJob);
 								GLERROR("asdasd");
-								std::vector<glm::mat4> frameBones;
-								if (modelJob->AnimationOffset.animation != nullptr) {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-								}
-								else {
-									frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-								}
-								glUniformMatrix4fv(glGetUniformLocation(forwardSplatMapSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
+								
+                                std::vector<glm::mat4> frameBones;
+                                if (modelJob->BlendTree != nullptr) {
+                                    frameBones = modelJob->BlendTree->GetFinalPose();
+                                } else {
+                                    frameBones = modelJob->Skeleton->GetTPose();
+                                }
+                                glUniformMatrix4fv(glGetUniformLocation(forwardSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 							}
 							else {
 								m_ForwardPlusSplatMapProgram->Bind();
@@ -889,10 +882,10 @@ void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<Rende
             }
 
             std::vector<glm::mat4> frameBones;
-            if (explosionEffectJob->AnimationOffset.animation != nullptr) {
-                frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations, explosionEffectJob->AnimationOffset);
+            if (explosionEffectJob->BlendTree != nullptr) {
+                frameBones = explosionEffectJob->BlendTree->GetFinalPose();
             } else {
-                frameBones = explosionEffectJob->Skeleton->GetFrameBones(explosionEffectJob->Animations);
+                frameBones = explosionEffectJob->Skeleton->GetTPose();
             }
             glUniformMatrix4fv(glGetUniformLocation(explosionHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
@@ -928,11 +921,12 @@ void DrawFinalPass::DrawShieldedModelRenderQueue(std::list<std::shared_ptr<Rende
                 BindModelTextures(forwardHandle ,modelJob);
 
                 std::vector<glm::mat4> frameBones;
-                if (modelJob->AnimationOffset.animation != nullptr) {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
+                if (modelJob->BlendTree != nullptr) {
+                    frameBones = modelJob->BlendTree->GetFinalPose();
                 } else {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                    frameBones = modelJob->Skeleton->GetTPose();
                 }
+
                 glUniformMatrix4fv(glGetUniformLocation(forwardHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
 
@@ -964,10 +958,10 @@ void DrawFinalPass::DrawToDepthStencilBuffer(std::list<std::shared_ptr<RenderJob
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 
             std::vector<glm::mat4> frameBones;
-            if (modelJob->AnimationOffset.animation != nullptr) {
-                frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
+            if (modelJob->BlendTree != nullptr) {
+                frameBones = modelJob->BlendTree->GetFinalPose();
             } else {
-                frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                frameBones = modelJob->Skeleton->GetTPose();
             }
             glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 

src/Engine/Rendering/PickingPass.cpp

@@ -104,16 +104,15 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-
-                    std::vector<glm::mat4> frameBones;
-                    if (modelJob->AnimationOffset.animation != nullptr) {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                    } else {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-                    }
-                    glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+                std::vector<glm::mat4> frameBones;
+				if (modelJob->BlendTree != nullptr) {
+                    frameBones = modelJob->BlendTree->GetFinalPose();
+                } else {
+                    frameBones = modelJob->Skeleton->GetTPose();
                 }
+                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+
             } else {
                 m_PickingProgram->Bind();
                 glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
@@ -162,13 +161,11 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                std::vector<glm::mat4> frameBones;
-                if (modelJob->AnimationOffset.animation != nullptr) {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                } else {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                if (modelJob->BlendTree != nullptr) {
+                    std::vector<glm::mat4> frameBones;
+                    frameBones = modelJob->BlendTree->GetFinalPose();
+                    glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
                 }
-                glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
             } else {
                 m_PickingProgram->Bind();
                 glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
@@ -218,11 +215,12 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;
-                if (modelJob->AnimationOffset.animation != nullptr) {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
+                if (modelJob->BlendTree != nullptr) {
+                    frameBones = modelJob->BlendTree->GetFinalPose();
                 } else {
-                    frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
+                    frameBones = modelJob->Skeleton->GetTPose();
                 }
+
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
 
             } else {
@@ -322,16 +320,10 @@ void PickingPass::Draw(RenderScene& scene)
                 glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "P"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix()));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
-                if (modelJob->Model->m_RawModel->m_Skeleton != nullptr) {
-
+                if (modelJob->BlendTree != nullptr) {
                     std::vector<glm::mat4> frameBones;
-                    if (modelJob->AnimationOffset.animation != nullptr) {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations, modelJob->AnimationOffset);
-                    } else {
-                        frameBones = modelJob->Skeleton->GetFrameBones(modelJob->Animations);
-                    }
+                    frameBones = modelJob->BlendTree->GetFinalPose();
                     glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
-
                 }
             } else {
                 m_PickingProgram->Bind();

src/Engine/Rendering/SSAOPass.cpp

@@ -56,6 +56,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
 		m_SSAOProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAO.frag.glsl")));
 		m_SSAOProgram->Compile();
+        m_SSAOProgram->BindFragDataLocation(0, "AO");
 		m_SSAOProgram->Link();
 	}
 
@@ -64,6 +65,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/SSAO.vert.glsl")));
 		m_SSAOViewSpaceZProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/SSAOViewSpaceZ.frag.glsl")));
 		m_SSAOViewSpaceZProgram->Compile();
+        m_SSAOViewSpaceZProgram->BindFragDataLocation(0, "depthLinear");
 		m_SSAOViewSpaceZProgram->Link();
 	}
 
@@ -72,6 +74,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_horiz.vert.glsl")));
 		m_GaussianProgram_horiz->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_horiz.frag.glsl")));
 		m_GaussianProgram_horiz->Compile();
+        m_GaussianProgram_horiz->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_horiz->Link();
 	}
 
@@ -80,6 +83,7 @@ void SSAOPass::InitializeShaderProgram()
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Gaussian_vert.vert.glsl")));
 		m_GaussianProgram_vert->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Gaussian_vert.frag.glsl")));
 		m_GaussianProgram_vert->Compile();
+        m_GaussianProgram_vert->BindFragDataLocation(0, "fragmentColor");
 		m_GaussianProgram_vert->Link();
 	}
 }

src/Engine/Rendering/Skeleton.cpp

@@ -1,343 +1,37 @@
 #include "Rendering/Skeleton.h"
 
-int Skeleton::CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix)
+std::map<int, Skeleton::PoseData> Skeleton::GetFrameBones(const Animation* animation, double time, bool additive, bool noRootMotion /*= false*/)
 {
-	if (m_BonesByName.find(name) != m_BonesByName.end()) {
-		return m_BonesByName.at(name)->ID;
-	} else {
-		Bone* bone;
-
-		if (parentID == -1) {
-			bone = new Bone(ID, nullptr, name, offsetMatrix);
-			RootBone = bone;
-		} else {
-			Bone* parent = Bones[parentID];
-			bone = new Bone(ID, parent, name, offsetMatrix);
-			parent->Children.push_back(bone);
-		}
-		
-		Bones[ID] = bone;
-		m_BonesByName[name] = bone;
-		return ID;
-	}
-}
-
-Skeleton::~Skeleton()
-{
-	for (auto &kv : Bones) {
-		delete kv.second;
-	}
-}
-
-
-
-const Skeleton::Animation* Skeleton::GetAnimation(std::string name)
-{
-	auto it = Animations.find(name);
-	if (it != Animations.end()) {
-		return const_cast<const Animation*>(&it->second);
-	} else {
-		return nullptr;
-	}
-}
-
-std::vector<glm::mat4> Skeleton::GetFrameBones(std::vector<AnimationData> animations, bool noRootMotion /*= false*/)
-{
-    if (animations.size() <= 0) {
-        std::vector<glm::mat4> finalMatrices;
+    if (animation == nullptr) {
+        std::map<int, PoseData> finalMatrices;
         for (auto& b : Bones) {
-            finalMatrices.push_back(glm::mat4(1));//b.second->OffsetMatrix);
+            PoseData poseData;
+            poseData.Translation = glm::vec3(0);
+            poseData.Orientation = glm::quat();
+            poseData.Scale = glm::vec3(1);
+
+
+            finalMatrices[b.second->ID] = poseData;
         }
         return finalMatrices;
     }
 
-    std::map<int, glm::mat4> frameBones;
-    AccumulateBoneTransforms(true, animations, frameBones, RootBone, glm::mat4(1));
 
-    std::vector<glm::mat4> finalMatrices;
-    for (auto &kv : frameBones) {
-        finalMatrices.push_back(kv.second);
+    std::map<int, PoseData> frameBones;
+
+    if(!additive) {
+        AccumulateBoneTransforms(true, animation, time, frameBones, RootBone);
+    } else {
+        AdditiveBoneTransforms(animation, time, frameBones, RootBone);
     }
-    return finalMatrices;
+
+    return frameBones;
 }
 
-std::vector<glm::mat4> Skeleton::GetFrameBones(std::vector<AnimationData> animations, AnimationOffset animationOffset, bool noRootMotion /*= false*/)
+void Skeleton::AccumulateBoneTransforms(bool noRootMotion, const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone)
 {
-    if (animations.size() <= 0 || animationOffset.animation == nullptr) {
-        std::vector<glm::mat4> finalMatrices;
-        for (auto& b : Bones) {
-            finalMatrices.push_back(glm::mat4(1));//b.second->OffsetMatrix);
-        }
-        return finalMatrices;
-    }
-
+    PoseData poseData;
     
-    std::map<int, glm::mat4> frameBones;
-    AccumulateBoneTransforms(true, animations, animationOffset, frameBones, RootBone, glm::mat4(1));
-
-    std::vector<glm::mat4> finalMatrices;
-    for (auto &kv : frameBones) {
-        finalMatrices.push_back(kv.second);
-    }
-    return finalMatrices;
-}
-
-void Skeleton::AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix)
-{
-    glm::mat4 boneMatrix;
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-    if (JointTransforms.size() <= 0) {
-        if (bone->Parent) {
-            boneMatrix = parentMatrix * glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix;
-            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-        } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix);
-            boneMatrices[bone->ID] = parentMatrix;
-        }
-    } else if (JointTransforms.size() == 1) {
-        boneMatrix = parentMatrix *(glm::translate(JointTransforms.at(0).PositionInterp) * glm::toMat4(JointTransforms.at(0).RotationInterp) * glm::scale(JointTransforms.at(0).ScaleInterp));
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-        boneMatrix = parentMatrix *(glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp));
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    }
-
-
-
-    for (auto &child : bone->Children) {
-        AccumulateBoneTransforms(noRootMotion, animations, boneMatrices, child, boneMatrix);
-    }
-}
-
-void Skeleton::AccumulateBoneTransforms(bool noRootMotion, std::vector<AnimationData> animations, AnimationOffset animationOffset, std::map<int, glm::mat4>& boneMatrices, const Bone* bone, glm::mat4 parentMatrix)
-{
-    glm::mat4 boneMatrix;
-
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-
-    glm::mat4 offset = GetOffsetTransform(bone, animationOffset);
-
-    if (JointTransforms.size() == 0) {
-        if (bone->Parent) {
-            if (offset != glm::mat4(1)) {
-                boneMatrix = parentMatrix * offset;// *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-            } else {
-                boneMatrix = parentMatrix  *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-
-            }
-            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-        } else {
-            boneMatrix = offset * glm::inverse(bone->OffsetMatrix);
-            boneMatrices[bone->ID] = parentMatrix;
-        }
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-
-
-        if (offset != glm::mat4(1)) {
-            boneMatrix = parentMatrix * ((glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) + offset);
-        } else {
-            boneMatrix = parentMatrix * (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp));
-        }
-
-        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
-    }
-
-    for (auto &child : bone->Children) {
-        AccumulateBoneTransforms(noRootMotion, animations, animationOffset, boneMatrices, child, boneMatrix);
-    }
-}
-
-glm::mat4 Skeleton::GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset)
-{
-    const Animation* animation = animationOffset.animation;
-    float time = animationOffset.time;
-
-    glm::vec3 position = glm::vec3(0);
-    glm::quat rotation = glm::quat();
-    glm::vec3 scale = glm::vec3(1);
-
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
         std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
@@ -364,37 +58,70 @@ glm::mat4 Skeleton::GetOffsetTransform(const Bone* bone, AnimationOffset animati
             }
 
             progress = glm::clamp(progress, 0.0f, 1.0f);
-            
             Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
             Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
 
-            position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-            rotation = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-            scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
+            glm::vec3 position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
+            glm::quat rotation = glm::normalize(glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress));
+            glm::vec3 scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
 
+            // Flag for no root motion
+            if (bone == RootBone && noRootMotion) {
+                position.x = 0;
+                position.z = 0;
+            }
+
+            poseData.Translation = position;
+            poseData.Orientation = rotation;
+            poseData.Scale = scale;
+            boneMatrices[bone->ID] = poseData;
 
         } else { // 1 keyframes for the current bone
             currentFrame = boneKeyFrames.at(0);
-            position = currentFrame.BoneProperties.Position;
-            rotation = currentFrame.BoneProperties.Rotation;
-            scale = currentFrame.BoneProperties.Scale;
+            poseData.Translation = currentFrame.BoneProperties.Position;
+            poseData.Orientation = currentFrame.BoneProperties.Rotation;
+            poseData.Scale = currentFrame.BoneProperties.Scale;
+            boneMatrices[bone->ID] = poseData;
         }
     }
 
-    return (glm::translate(position) * glm::toMat4(rotation) * glm::scale(scale));
+    for (auto &child : bone->Children) {
+        AccumulateBoneTransforms(noRootMotion, animation, time, boneMatrices, child);
+    }
 }
 
 
-glm::mat4 Skeleton::GetBoneTransform(const Bone* bone, const Animation* animation, float time, glm::mat4 childMatrix)
+void Skeleton::AdditiveBoneTransforms(const Animation* animation, double time, std::map<int, PoseData>& boneMatrices, const Bone* bone)
 {
-    glm::mat4 boneMatrix;
+    if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
+        PoseData refPose = GetAdditiveBonePose(bone, animation, 0.0);
+        PoseData srcPose = GetAdditiveBonePose(bone, animation, time + 1.0/60.0);
+        
+        PoseData finalPose;
+        finalPose.Translation = srcPose.Translation - refPose.Translation;
+        finalPose.Orientation = srcPose.Orientation * glm::inverse(refPose.Orientation);
+        finalPose.Scale = srcPose.Scale - refPose.Scale;
 
-    Animation::Keyframe currentFrame;
-    Animation::Keyframe nextFrame;
+        boneMatrices[bone->ID] = finalPose;
+    }
+
+    for (auto &child : bone->Children) {
+        AdditiveBoneTransforms(animation, time, boneMatrices, child);
+    }
+}
+
+Skeleton::PoseData Skeleton::GetAdditiveBonePose(const Bone* bone, const Animation* animation, double time)
+{
+    glm::vec3 position = glm::vec3(0);
+    glm::quat rotation = glm::quat();
+    glm::vec3 scale = glm::vec3(1);
 
     if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
         std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
 
+        Animation::Keyframe currentFrame;
+        Animation::Keyframe nextFrame;
+
         if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
             for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
                 if (time >= boneKeyFrames.at(index).Time) {
@@ -413,276 +140,148 @@ glm::mat4 Skeleton::GetBoneTransform(const Bone* bone, const Animation* animatio
                 progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
             }
 
-            if (progress > 1.0f || progress < 0.0f) {
-                LOG_INFO("Progress %f", progress);
-                progress = glm::clamp(progress, 0.0f, 1.0f);
-            }
+            progress = glm::clamp(progress, 0.0f, 1.0f);
+            
             Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
             Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
 
-            glm::vec3 positionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-            glm::quat rotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-            glm::vec3 scaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
+            position = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
+            rotation = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
+            scale = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
 
-            boneMatrix = (glm::translate(positionInterp) * glm::toMat4(rotationInterp) * glm::scale(scaleInterp)) * childMatrix;
 
         } else { // 1 keyframes for the current bone
             currentFrame = boneKeyFrames.at(0);
-            boneMatrix = (glm::translate(currentFrame.BoneProperties.Position) * glm::toMat4(currentFrame.BoneProperties.Rotation) * glm::scale(currentFrame.BoneProperties.Scale)) * childMatrix;
-
-        }
-    } else { // 0 keyframes for the current bone
-        if (bone->Parent) {
-            boneMatrix = bone->Parent->OffsetMatrix * glm::inverse(bone->OffsetMatrix) * childMatrix;
-        } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * childMatrix;
+            position = currentFrame.BoneProperties.Position;
+            rotation = currentFrame.BoneProperties.Rotation;
+            scale = currentFrame.BoneProperties.Scale;
         }
     }
 
-    if (bone->Parent) {
-        return  GetBoneTransform(bone->Parent, animation, time, boneMatrix);
-    } else {
-        return boneMatrix;
+    PoseData finalPose;
+    finalPose.Translation = position;
+    finalPose.Orientation = rotation;
+    finalPose.Scale = scale;
+
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::BlendPoses(const std::map<int, PoseData>& pose1, const std::map<int, PoseData>& pose2, double weight)
+{
+    std::map<int, PoseData> finalPose;
+
+    float weight1 = (float)(1.0 - weight);
+    float weight2 = (float)(weight);
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        PoseData blendedPose;
+        blendedPose.Translation = glm::vec3(0);
+        blendedPose.Orientation = glm::quat();
+        blendedPose.Scale = glm::vec3(1);
+
+        if(pose1.find(boneID) != pose1.end() && pose2.find(boneID) != pose2.end()) {
+            blendedPose.Translation = pose1.at(boneID).Translation * weight1 + pose2.at(boneID).Translation * weight2;
+            blendedPose.Orientation = glm::slerp(pose1.at(boneID).Orientation, pose2.at(boneID).Orientation, weight2);
+            blendedPose.Scale = pose1.at(boneID).Scale * weight1 + pose2.at(boneID).Scale * weight2;
+            finalPose[boneID] = blendedPose;
+        } else if(pose1.find(boneID) != pose1.end()) {
+            finalPose[boneID] = pose1.at(boneID);
+        } else if (pose2.find(boneID) != pose2.end()) {
+            finalPose[boneID] = pose2.at(boneID);
+        }
     }
+
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::OverridePose(const std::map<int, PoseData>& overridePose, const std::map<int, PoseData>& targetPose)
+{
+    std::map<int, PoseData> finalPose;
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        if (overridePose.find(boneID) != overridePose.end()) {
+            finalPose[boneID] = overridePose.at(boneID);
+        } else if (targetPose.find(boneID) != targetPose.end()) {
+            finalPose[boneID] = targetPose.at(boneID);
+        }
+    }
+    return finalPose;
+}
+
+std::map<int, Skeleton::PoseData> Skeleton::BlendPoseAdditive(const std::map<int, PoseData>& additivePose, const std::map<int, PoseData>& targetPose)
+{
+    std::map<int, PoseData> finalPose;
+
+    for (auto& b : Bones) {
+        int boneID = b.second->ID;
+        PoseData blendedPose;
+        blendedPose.Translation = glm::vec3(0);
+        blendedPose.Orientation = glm::quat();
+        blendedPose.Scale = glm::vec3(1);
+
+        if (additivePose.find(boneID) != additivePose.end() && targetPose.find(boneID) != targetPose.end()) {
+            blendedPose.Translation = additivePose.at(boneID).Translation + targetPose.at(boneID).Translation;
+            blendedPose.Orientation = additivePose.at(boneID).Orientation * targetPose.at(boneID).Orientation;
+            blendedPose.Scale = additivePose.at(boneID).Scale + targetPose.at(boneID).Scale;
+            finalPose[boneID] = blendedPose;
+        } else if (additivePose.find(boneID) != additivePose.end()) {
+            finalPose[boneID] = additivePose.at(boneID);
+        } else if (targetPose.find(boneID) != targetPose.end()) {
+            finalPose[boneID] = targetPose.at(boneID);
+        }
+    }
+
+    return finalPose;
+}
+
+void Skeleton::GetFinalPose(std::map<int, Skeleton::PoseData>& poseDatas, std::vector<glm::mat4>& finalPose, std::map<int, glm::mat4>& boneTransforms)
+{
+
+    std::map<int, glm::mat4> boneMatrices;
+
+    AccumulateFinalPose(boneMatrices, poseDatas, boneTransforms, RootBone, glm::mat4(1));
+
+    for(auto& b : boneMatrices) {
+        finalPose.push_back(b.second);
+    }
+
 }
 
 
-glm::mat4 Skeleton::GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, AnimationOffset animationOffset, glm::mat4 childMatrix)
+std::vector<glm::mat4> Skeleton::GetTPose()
 {
-    glm::mat4 boneMatrix;
-
-    std::vector<JointFrameTransform> JointTransforms;
-
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
+    std::vector<glm::mat4> finalMatrices;
 
+    for (auto b : Bones) {
+        finalMatrices.push_back(glm::mat4(1));
     }
 
-
-    glm::mat4 offset = GetOffsetTransform(bone, animationOffset);
-
-    if (JointTransforms.size() == 0) {
-        if (bone->Parent) {
-            if (offset != glm::mat4(1)) {
-                boneMatrix = offset * childMatrix;// *((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix));
-            } else {
-                boneMatrix = ((glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix)) * childMatrix;
-            }
-        } else {
-            boneMatrix = offset * glm::inverse(bone->OffsetMatrix);
-        }
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-
-        }
-
-        if (offset != glm::mat4(1)) {
-            boneMatrix = ((glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) + offset) * childMatrix;
-        } else {
-            boneMatrix = (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) * childMatrix;
-        }
-    }
-
-    if (bone->Parent != nullptr) {
-        return GetBoneTransform(noRootMotion, bone->Parent, animations, animationOffset, boneMatrix);
-    } else {
-        return boneMatrix;
-    }
+    return finalMatrices;
 }
 
-
-glm::mat4 Skeleton::GetBoneTransform(bool noRootMotion, const Bone* bone, std::vector<AnimationData> animations, glm::mat4 childMatrix)
+void Skeleton::AccumulateFinalPose(std::map<int, glm::mat4>& boneMatrices, std::map<int, Skeleton::PoseData>& poseDatas, std::map<int, glm::mat4>& boneTransforms, const Bone* bone, glm::mat4 parentMatrix)
 {
     glm::mat4 boneMatrix;
-    std::vector<JointFrameTransform> JointTransforms;
 
-    for (const AnimationData animationData : animations) {
-        const Animation* animation = animationData.animation;
-        const float time = animationData.time;
-
-        JointFrameTransform jointTransform;
-        jointTransform.Weight = animationData.weight;;
-
-        if (animation->JointAnimations.find(bone->ID) != animation->JointAnimations.end()) {
-            std::vector<Animation::Keyframe> boneKeyFrames = animation->JointAnimations.at(bone->ID);
-
-            Animation::Keyframe currentFrame;
-            Animation::Keyframe nextFrame;
-
-            if (boneKeyFrames.size() > 1) { // 2+ keyframes for the current bone
-                for (int index = boneKeyFrames.size()-1; index >= 0; index--) { // find the bone keyframes that surrounds the current frame
-                    if (time >= boneKeyFrames.at(index).Time) {
-                        currentFrame = boneKeyFrames.at(index);
-                        nextFrame = boneKeyFrames.at((index + 1) % boneKeyFrames.size());
-                        break;
-                    }
-                }
-
-                float progress;
-
-                if (nextFrame.Index == 0) {
-                    nextFrame = currentFrame;
-                    progress = (time - currentFrame.Time) / (animation->Duration - currentFrame.Time);
-                } else {
-                    progress = (time - currentFrame.Time) / (nextFrame.Time - currentFrame.Time);
-                }
-
-
-                if (progress > 1.0f || progress < 0.0f) {
-                    progress = glm::clamp(progress, 0.0f, 1.0f);
-                }
-                Animation::Keyframe::BoneProperty currentBoneProperty = currentFrame.BoneProperties;
-                Animation::Keyframe::BoneProperty nextBoneProperty = nextFrame.BoneProperties;
-
-                jointTransform.PositionInterp = currentBoneProperty.Position * (1.f - progress) + nextBoneProperty.Position * progress;
-                jointTransform.RotationInterp = glm::slerp(currentBoneProperty.Rotation, nextBoneProperty.Rotation, progress);
-                jointTransform.ScaleInterp = currentBoneProperty.Scale * (1.f - progress) + nextBoneProperty.Scale * progress;
-
-                // Flag for no root motion
-                if (bone == RootBone && noRootMotion) {
-                    jointTransform.PositionInterp.x = 0;
-                    jointTransform.PositionInterp.z = 0;
-                }
-
-                JointTransforms.push_back(jointTransform);
-
-            } else { // 1 keyframes for the current bone
-                currentFrame = boneKeyFrames.at(0);
-                jointTransform.PositionInterp = currentFrame.BoneProperties.Position;
-                jointTransform.RotationInterp = currentFrame.BoneProperties.Rotation;
-                jointTransform.ScaleInterp = currentFrame.BoneProperties.Scale;
-                JointTransforms.push_back(jointTransform);
-
-            }
-        } else { // 0 keyframes for the current bone
-
-        }
-
-    }
-
-    if (JointTransforms.size() <= 0) {
+    if (poseDatas.find(bone->ID) != poseDatas.end()) {
+        boneMatrix = parentMatrix * (glm::translate(poseDatas.at(bone->ID).Translation) * glm::mat4(poseDatas.at(bone->ID).Orientation) * glm::scale(poseDatas.at(bone->ID).Scale));
+        boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
+    } else {
         if (bone->Parent) {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix * childMatrix;
+            boneMatrix = parentMatrix * (glm::inverse(bone->OffsetMatrix) * bone->Parent->OffsetMatrix);
+            boneMatrices[bone->ID] = boneMatrix * bone->OffsetMatrix;
         } else {
-            boneMatrix = glm::inverse(bone->OffsetMatrix) * childMatrix;
+            boneMatrix = glm::inverse(bone->OffsetMatrix);
+            boneMatrices[bone->ID] = parentMatrix;
         }
-    } else if (JointTransforms.size() == 1) {
-        boneMatrix = (glm::translate(JointTransforms.at(0).PositionInterp) * glm::toMat4(JointTransforms.at(0).RotationInterp) * glm::scale(JointTransforms.at(0).ScaleInterp)) * childMatrix;
-    } else {
-
-        glm::vec3 finalPosInterp;
-        glm::quat finalRotInterp;
-        glm::vec3 finalScaleInterp;
-        float totalWeight = 0;
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            totalWeight += jointTransform.Weight;
-        }
-
-
-        for (JointFrameTransform jointTransform : JointTransforms) {
-            if (jointTransform.Weight == 1.0f) {
-                finalPosInterp = jointTransform.PositionInterp;
-                finalRotInterp = jointTransform.RotationInterp;
-                finalScaleInterp = jointTransform.ScaleInterp;
-                break;
-            } else {
-                finalPosInterp += jointTransform.PositionInterp * (jointTransform.Weight/totalWeight);
-                finalRotInterp *= glm::slerp(glm::quat(), jointTransform.RotationInterp, (jointTransform.Weight/totalWeight));
-                finalScaleInterp += jointTransform.ScaleInterp * (jointTransform.Weight/totalWeight);
-            }
-        }
-
-        boneMatrix = (glm::translate(finalPosInterp) * glm::toMat4(finalRotInterp) * glm::scale(finalScaleInterp)) * childMatrix;
     }
 
+    boneTransforms[bone->ID] = boneMatrix;
 
-
-    if (bone->Parent != nullptr) {
-        return GetBoneTransform(noRootMotion, bone->Parent, animations, boneMatrix);
-    } else {
-        return boneMatrix;
+    for (auto &child : bone->Children) {
+        AccumulateFinalPose(boneMatrices, poseDatas, boneTransforms, child, boneMatrix);
     }
 }
 
@@ -695,46 +294,41 @@ int Skeleton::GetBoneID(std::string name)
 	}
 }
 
-void Skeleton::PrintSkeleton()
+int Skeleton::CreateBone(int ID, int parentID, std::string name, glm::mat4 offsetMatrix)
 {
-	if (LOG_LEVEL < LOG_LEVEL_DEBUG) {
-		return;
-	}
-	PrintSkeleton(RootBone, 0);
+    if (m_BonesByName.find(name) != m_BonesByName.end()) {
+        return m_BonesByName.at(name)->ID;
+    } else {
+        Bone* bone;
+
+        if (parentID == -1) {
+            bone = new Bone(ID, nullptr, name, offsetMatrix);
+            RootBone = bone;
+        } else {
+            Bone* parent = Bones[parentID];
+            bone = new Bone(ID, parent, name, offsetMatrix);
+            parent->Children.push_back(bone);
+        }
+
+        Bones[ID] = bone;
+        m_BonesByName[name] = bone;
+        return ID;
+    }
 }
 
-void Skeleton::PrintSkeleton(const Bone* bone, int depthCount)
+Skeleton::~Skeleton()
 {
-	std::stringstream ss;
-	ss << std::string(depthCount, ' ');
-	ss << bone->ID << ": " << bone->Name;
-	std::cout << ss.str() << std::endl;
-	
-	depthCount++;
-
-	for (auto &child : bone->Children) {
-		PrintSkeleton(child, depthCount);
-	}
+    for (auto &kv : Bones) {
+        delete kv.second;
+    }
 }
 
-int Skeleton::GetKeyframe(const Animation& animation, double time)
+const Skeleton::Animation* Skeleton::GetAnimation(std::string name)
 {
-
-/*
-	if (time < 0) {
-		time = 0;
-	}
-	if (time >= animation.Duration) {
-		return animation..size() - 1;
-	}
-
-	for (int keyframe = 0; keyframe < animation.Keyframes.size(); ++keyframe) {
-		if (animation.Keyframes[keyframe].Time > time) {
-			return (keyframe - 1) % animation.Keyframes.size();
-		}
-	}
-*/
-
-
-	return 0;
-}
+    auto it = Animations.find(name);
+    if (it != Animations.end()) {
+        return const_cast<const Animation*>(&it->second);
+    } else {
+        return nullptr;
+    }
+}

src/Game/Game.cpp

@@ -34,6 +34,7 @@
 #include "Game/Systems/KillFeedSystem.h"
 #include "Game/Systems/BoostSystem.h"
 #include "Game/Systems/BoostIconsHUDSystem.h"
+#include "Game/Systems/ScoreScreenSystem.h"
 #include "GUI/ButtonSystem.h"
 #include "GUI/MainMenuSystem.h"
 
@@ -143,7 +144,6 @@ Game::Game(int argc, char* argv[])
     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);
@@ -155,6 +155,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
     m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");