Merge remote-tracking branch 'origin/Playtest2-Fallback' into Playtest2-Fallback

include/Engine/Core/ComponentInfo.h

@@ -2,7 +2,6 @@
 #define ComponentInfo_h__
 
 #include "../Common.h"
-#include "Entity.h"
 #include <boost/shared_array.hpp>
 
 struct ComponentInfo
@@ -22,7 +21,6 @@ struct ComponentInfo
     {
         std::string Name;
         std::string Type;
-        unsigned char Index;
         unsigned int Offset;
         unsigned int Stride;
     };
@@ -34,16 +32,6 @@ struct ComponentInfo
     unsigned int Stride = 0;
     boost::shared_array<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
-
-    std::size_t GetHeaderSize() const
-    {
-        std::size_t size = 0;
-
-        // A component block starts with an entity ID
-        size += sizeof(EntityID);
-
-        return size;
-    }
 };
 
 template<>

include/Engine/Core/ComponentPool.h

@@ -5,15 +5,16 @@
 #include "MemoryPool.h"
 #include "ComponentInfo.h"
 #include "ComponentWrapper.h"
-#include "DirtySet.h"
 
-
-class ComponentPool;
 class ComponentPoolForwardIterator
 	: public std::iterator<std::forward_iterator_tag, ComponentWrapper>
 {
 public:
-    ComponentPoolForwardIterator(ComponentPool* pool);
+    ComponentPoolForwardIterator(const ComponentInfo& componentInfo, const MemoryPool<char>::iterator begin, const MemoryPool<char>::iterator end) 
+        : m_ComponentInfo(componentInfo)
+        , m_MemoryPoolIterator(begin)
+        , m_MemoryPoolEnd(end)
+    { }
 
 	ComponentPoolForwardIterator(const ComponentPoolForwardIterator& other) = default;
 	ComponentPoolForwardIterator(ComponentPoolForwardIterator&& other) = default;
@@ -26,7 +27,6 @@ public:
 	ComponentWrapper operator*() const;
 
 private:
-    ComponentPool* m_ComponentPool;
     const ComponentInfo& m_ComponentInfo;
 	MemoryPool<char>::iterator m_MemoryPoolIterator;
 	const MemoryPool<char>::iterator m_MemoryPoolEnd;
@@ -34,7 +34,6 @@ private:
 
 class ComponentPool
 {
-    friend class ComponentPoolForwardIterator;
 public:
 	typedef ComponentPoolForwardIterator iterator;
 	typedef ptrdiff_t difference_type;
@@ -42,11 +41,10 @@ public:
     typedef ComponentWrapper value_type;
 	typedef ComponentWrapper* pointer;
 	typedef ComponentWrapper& reference;
-    typedef std::unordered_map<EntityID, std::set<decltype(ComponentInfo::Field_t::Index)>> DirtySet_t;
 
     ComponentPool(const ::ComponentInfo& ci) 
         : m_ComponentInfo(ci)
-        , m_Pool(ci.Meta->Allocation, ci.GetHeaderSize() + ci.Stride)
+        , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
     { }
     ~ComponentPool();
 	ComponentPool(const ComponentPool& other);
@@ -63,8 +61,8 @@ public:
     // Delete a component and free its memory
     void Delete(ComponentWrapper& wrapper);
 
-    iterator begin();
-	iterator end();
+	iterator begin() const;
+	iterator end() const;
     size_t size() const;
 
 	//Dumps information about what the pool memory looks like right now 
@@ -82,7 +80,6 @@ private:
     ::ComponentInfo m_ComponentInfo;
     MemoryPool<char> m_Pool;
     std::unordered_map<EntityID, char*> m_EntityToComponent;
-    DirtySet m_DirtySet;
 };
 
 #endif

include/Engine/Core/ComponentWrapper.h

@@ -6,54 +6,44 @@
 #include "../Common.h"
 #include "Entity.h"
 #include "ComponentInfo.h"
-#include "DirtySet.h"
 #include "Util/Any.h"
 
+template <typename T, typename Enable = void>
+struct ComponentField { };
+
+template <typename T>
+struct ComponentField<T, typename std::enable_if<std::is_trivially_copyable<T>::value>::type>
+{
+    static T& Get(const ComponentInfo::Field_t& info, char* data) { return *reinterpret_cast<T*>(data); }
+    static void Set(const ComponentInfo::Field_t& info, char* data, const T& value) { Get(data) = value; }
+};
+
+template <>
+struct ComponentField<std::string, void>
+{
+    static std::string& Get(const ComponentInfo::Field_t& info, char* data) { return **reinterpret_cast<std::string**>(data); }
+    static void Set(const ComponentInfo::Field_t& info, char* data, const std::string& value) { Get(info, data) = value; }
+};
+
 struct ComponentWrapper
 {
-    ComponentWrapper(const ComponentInfo& componentInfo, char* data, ::DirtyBitField* dirtyBitField)
+    ComponentWrapper(const ComponentInfo& componentInfo, char* data)
         : Info(componentInfo)
         , EntityID(*reinterpret_cast<::EntityID*>(data))
-        , Data(data + componentInfo.GetHeaderSize())
-        , DirtyBitField(dirtyBitField)
+        , Data(data + sizeof(::EntityID))
     { }
 
     const ComponentInfo& Info;
     const ::EntityID EntityID;
     char* Data;
-    ::DirtyBitField* DirtyBitField = nullptr;
 
     ComponentInfo::EnumType Enum(const char* fieldName, const char* enumKey)
     {
         return Info.Meta->FieldEnumDefinitions.at(fieldName).at(enumKey);
     }
 
-    bool Dirty(DirtySetType type, const std::string& fieldName)
-    {
-        if (DirtyBitField == nullptr) {
-            return true;
-        } else {
-            auto& field = Info.Fields.at(fieldName);
-            return DirtyBitField->operator[](type).count(field.Index) == 1;
-        }
-    }
-
-    void SetDirty(DirtySetType type, const std::string& fieldName, bool dirty = true)
-    {
-        if (DirtyBitField == nullptr) {
-            return;
-        }
-
-        auto& field = Info.Fields.at(fieldName);
-        if (dirty) {
-            DirtyBitField->operator[](type).insert(field.Index);
-        } else {
-            DirtyBitField->operator[](type).erase(field.Index);
-        }
-    }
-
     template <typename T>
-    T& Field(const std::string& name)
+    T& Field(std::string name)
     {
         const ComponentInfo::Field_t& field = Info.Fields.at(name);
         if (sizeof(T) > field.Stride) {
@@ -65,13 +55,13 @@ struct ComponentWrapper
     }
 
     template <typename T>
-    void SetField(const std::string& name, const T value) { Field<T>(name) = value; }
+    void SetField(std::string name, const T value) { Field<T>(name) = value; }
     //template <typename T>
     //void SetField(std::string name, T& value) { Field<T>(name) = value; }
 
     // Specialization for string literals
     template <std::size_t N>
-    void SetField(const std::string& name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
+    void SetField(std::string name, const char(&value)[N]) { Field<std::string>(name) = std::string(value); }
 
     void Copy(ComponentWrapper& destination)
     {
@@ -106,41 +96,39 @@ struct ComponentWrapper
     {
         friend struct ComponentWrapper;
     private:
-        SubscriptProxy(ComponentWrapper* component, std::string fieldName)
+        SubscriptProxy(ComponentWrapper* component, std::string propertyName)
             : m_Component(component)
-            , m_FieldName(fieldName)
+            , m_PropertyName(propertyName)
         { }
 
         ComponentWrapper* m_Component;
-        std::string m_FieldName;
+        std::string m_PropertyName;
 
     public:
         // Return the integer value of an enum type key for this field
-        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_FieldName.c_str(), enumKey); }
-        bool Dirty(DirtySetType type) { return m_Component->Dirty(type, m_FieldName); }
-        void SetDirty(DirtySetType type, bool dirty = true) { m_Component->SetDirty(type, m_FieldName, dirty); }
+        ComponentInfo::EnumType Enum(const char* enumKey) { return m_Component->Enum(m_PropertyName.c_str(), enumKey); }
 
         template <typename T>
-        operator T&() { return m_Component->Field<T>(m_FieldName); }
+        operator T&() { return m_Component->Field<T>(m_PropertyName); }
 
         template <typename T>
-        void operator=(const T val) { m_Component->SetField<T>(m_FieldName, val); }
+        void operator=(const T val) { m_Component->SetField<T>(m_PropertyName, val); }
         // TODO: Pass by reference and rvalue (universal reference?)
         //template <typename T>
         //void operator=(T& val) { m_Component->SetField<T>(m_PropertyName, val); }
 
         // Specialization for string literals
         template <std::size_t N>
-        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_FieldName, val); }
+        void operator=(const char(&val)[N]) { m_Component->SetField<N>(m_PropertyName, val); }
     };
-    SubscriptProxy operator[](const std::string& propertyName) { return SubscriptProxy(this, propertyName); }
+    SubscriptProxy operator[](std::string propertyName) { return SubscriptProxy(this, propertyName); }
 };
 
 // A component wrapper that "owns" its data through a shared pointer
 struct SharedComponentWrapper : ComponentWrapper
 {
     SharedComponentWrapper(const ComponentInfo& componentInfo, boost::shared_array<char> data)
-        : ComponentWrapper(componentInfo, data.get(), nullptr)
+        : ComponentWrapper(componentInfo, data.get())
         , m_DataReference(data)
     { }
 

include/Engine/Core/DirtySet.h

@@ -1,16 +0,0 @@
-#ifndef DirtySet_h__
-#define DirtySet_h__
-
-#include <set>
-#include "ComponentInfo.h"
-
-enum class DirtySetType
-{
-    Transform,
-    Network
-};
-
-typedef std::unordered_map<DirtySetType, std::set<decltype(ComponentInfo::Field_t::Index)>> DirtyBitField;
-typedef std::unordered_map<EntityID, DirtyBitField> DirtySet;
-
-#endif

include/Engine/Core/EPlayerDeath.h

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

include/Engine/Core/EntityWrapper.h

@@ -29,7 +29,6 @@ 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& scoreScreen, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System

include/Engine/Core/SystemPipeline.h

@@ -81,7 +81,7 @@ public:
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
                 auto& systems = pair.second;
-                ComponentPool* pool = m_World->GetComponents(componentName);
+                const ComponentPool* pool = m_World->GetComponents(componentName);
                 if (pool == nullptr) {
                     continue;
                 }

include/Engine/Core/World.h

@@ -35,7 +35,7 @@ public:
     // Delete a component off an entity
     void DeleteComponent(EntityID entity, const std::string& componentType);
     // Get all components of the specified type
-    ComponentPool* GetComponents(const std::string& componentType);
+    const ComponentPool* GetComponents(const std::string& componentType);
     // Get entity parent
     EntityID GetParent(EntityID entity);
     // Change the parent of an entity

include/Engine/Editor/EditorCameraInputController.h

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

include/Engine/Input/FirstPersonInputController.h

@@ -6,13 +6,12 @@
 #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, EntityWrapper playerEntity);
+    FirstPersonInputController(EventBroker* eventBroker, int playerID);
 
     virtual const glm::vec3 Movement() const { return m_Movement; }
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
@@ -35,8 +34,6 @@ public:
 
 protected:
     const int m_PlayerID;
-    EntityWrapper m_PlayerEntity;
-
     bool m_MouseLocked = false;
     glm::vec3 m_Rotation;
     glm::vec3 m_Movement;
@@ -68,10 +65,9 @@ protected:
 };
 
 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID, EntityWrapper playerEntity)
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
     : InputController(eventBroker)
     , m_PlayerID(playerID)
-    , m_PlayerEntity(playerEntity)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse);
     EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse);
@@ -122,84 +118,13 @@ 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);
-                }
-            }
         }
     }
 
@@ -234,32 +159,6 @@ 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

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

@@ -1,17 +0,0 @@
-#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,9 +21,6 @@
 #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
 {
@@ -36,7 +33,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;
@@ -80,8 +77,7 @@ private:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
-    PlayerID getPlayerIDFromEndpoint();
-    PlayerID getPlayerIDFromEntityID(EntityID entityID);
+    PlayerID GetPlayerIDFromEndpoint();
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
@@ -107,8 +103,6 @@ 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,32 +3,27 @@
 
 #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 "Rendering/BlendTree.h"
-#include "Rendering/EAutoAnimationBlend.h"
-#include "../Core/EntityWrapper.h"
-#include "Rendering/AutoBlendQueue.h"
-#include "../Input/EInputCommand.h"
-#include "imgui/imgui.h"
+#include <imgui/imgui.h>
 
-class AnimationSystem : public ImpureSystem
+class AnimationSystem : public PureSystem
 {
 public:
-    AnimationSystem(SystemParams params);
-    ~AnimationSystem() { }
-    virtual void Update(double dt) override;
-private:
-    void CreateBlendTrees();
-    void UpdateAnimations(double dt);
-    void UpdateWeights(double dt);
+    AnimationSystem(SystemParams params)
+        : System(params)
+        , PureSystem("Animation")
+    {
+
+    }
+    ~AnimationSystem() { }
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& animationComponent, double dt) override;
+private:
 
-    EventRelay<AnimationSystem, Events::AutoAnimationBlend> m_EAutoAnimationBlend;
-    bool OnAutoAnimationBlend(Events::AutoAnimationBlend& e);
-    std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
 };
 
 #endif

include/Engine/Rendering/AutoBlendQueue.h

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

@@ -1,101 +0,0 @@
-#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,7 +8,6 @@
 #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

@@ -1,29 +0,0 @@
-#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,7 +15,6 @@
 #include "../Core/Transform.h"
 #include "Skeleton.h"
 #include "ShaderProgram.h"
-#include "BlendTree.h"
 
 struct ModelJob : RenderJob
 {
@@ -124,14 +123,32 @@ struct ModelJob : RenderJob
             Skeleton = Model->m_RawModel->m_Skeleton;
 
             if (Skeleton != nullptr) {
-                
-                EntityWrapper entityWrapper = EntityWrapper(world, modelComponent.EntityID);
+                if (world->HasComponent(Entity, "Animation")) {
+                    auto animationComponent = world->GetComponent(Entity, "Animation");
 
-                if(Skeleton->BlendTrees.find(entityWrapper) != Skeleton->BlendTrees.end()) {
-                    BlendTree = Skeleton->BlendTrees.at(entityWrapper);
+                    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;
                 }
             }
         }
+            
     };
 
     unsigned int TextureID;
@@ -150,7 +167,10 @@ struct ModelJob : RenderJob
     glm::vec4 Color;
     const ::Model* Model = nullptr;
     ::Skeleton* Skeleton = nullptr;
-    std::shared_ptr<::BlendTree> BlendTree = nullptr;
+    std::vector<::Skeleton::AnimationData> Animations;
+    ::Skeleton::AnimationOffset AnimationOffset;
+    
+
     float GlowIntensity = 8.0;
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;

include/Engine/Rendering/Skeleton.h

@@ -6,9 +6,27 @@
 #include "../GLM.h"
 #include <glm/gtx/matrix_decompose.hpp>
 #include <imgui/imgui.h>
-#include "../Core/EntityWrapper.h"
 
-class BlendTree;
+//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 Skeleton
 {
@@ -50,43 +68,58 @@ public:
         std::map<int, std::vector<Keyframe>> JointAnimations;
 	};
 
-    struct PoseData {
-        glm::vec3 Translation;
-        glm::quat Orientation;
-        glm::vec3 Scale;
+    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;
     };
 
 	Skeleton() { }
 	~Skeleton();
 
 	Bone* RootBone;
-	std::map<int, Bone*> Bones;
 
-    std::unordered_map<EntityWrapper, std::shared_ptr<BlendTree>> BlendTrees;
+	std::map<int, Bone*> Bones;
 
 	// 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);
 
-    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 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);
 
+    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:
-    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);
+
+    glm::mat4 GetOffsetTransform(const Bone* bone, AnimationOffset animationOffset);
 
 	std::map<std::string, Bone*> m_BonesByName;
     

include/Game/Systems/AbilityCooldownHUDSystem.h

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

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,8 +30,6 @@ 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

@@ -1,44 +0,0 @@
-#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,8 +2,6 @@
 #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,7 +5,6 @@
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
-#include "Rendering/EAutoAnimationBlend.h"
 
 class AssaultWeaponBehaviour : public WeaponBehaviour<AssaultWeaponBehaviour>
 {
@@ -21,7 +20,6 @@ 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,7 +9,6 @@
 #include "Systems/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
-#include "Rendering/EAutoAnimationBlend.h"
 
 template <typename ETYPE>
 class WeaponBehaviour : public PureSystem
@@ -32,21 +31,6 @@ 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;
@@ -110,64 +94,6 @@ 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)
@@ -254,10 +180,6 @@ private:
 
     void selectWeapon(ComponentWrapper cWeapon, EntityWrapper player)
     {
-        if (!IsServer) {
-            return;
-        }
-
         // Don't reselect weapon if it's already active
         if (getActiveWeapon(player)) {
             return;
@@ -287,11 +209,9 @@ private:
         // Spawn the weapon(s)
         EntityWrapper firstPersonWeapon;
         EntityWrapper thirdPersonWeapon;
-        //if (IsClient) {
-            if (firstPersonAttachment.Valid()) {
-                firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
-            }
-        //}
+        if (firstPersonAttachment.Valid()) {
+            firstPersonWeapon = SpawnerSystem::Spawn(firstPersonAttachment, firstPersonAttachment);
+        }
         if (thirdPersonAttachment.Valid()) {
             thirdPersonWeapon = SpawnerSystem::Spawn(thirdPersonAttachment, thirdPersonAttachment);
         }

resources/Schema/Components.xsd

@@ -33,6 +33,7 @@
 	<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"/>
@@ -47,9 +48,6 @@
 	<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"/>
@@ -63,6 +61,4 @@
 	<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,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Animation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Animation.xsd">
-	<AnimationName></AnimationName>
-	<Time>0</Time>
-	<Play>false</Play>
-	<Reverse>false</Reverse>
-	<Speed>0</Speed>
-	<Loop>true</Loop>
-	<Additive>false</Additive>
+	<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>
 </Animation>

resources/Schema/Components/Animation.xsd

@@ -2,17 +2,27 @@
 
 <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="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: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:all>
+			<xs:attribute name="replicated" type="xs:boolean" fixed="true"/>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>

resources/Schema/Components/AnimationOffset.xml

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

@@ -0,0 +1,17 @@
+<?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,11 +11,10 @@
 	<RPM>420</RPM>
 	<ViewPunch>0.03</ViewPunch>
 	<ViewReturnSpeed>0.18</ViewReturnSpeed>
-	<ReloadTime>1.65</ReloadTime>
+	<ReloadTime>2</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,7 +44,6 @@
 				</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

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

@@ -1,15 +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="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

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

@@ -1,13 +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="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

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

@@ -1,13 +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="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

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

@@ -1,32 +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="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

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

@@ -1,20 +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="ScoreScreen">
-		<xs:annotation><xs:documentation>The screen where player scores will be shown.</xs:documentation></xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="TotalIdentities" type="t:int" minOccurs="0">
-					<xs:annotation><xs:documentation>The amount of score identities this scoreboard hold</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="NextPosition" type="t:int" minOccurs="0">
-					<xs:annotation><xs:documentation>Where the next scoreIdentity should be placed.</xs:documentation></xs:annotation>
-				</xs:element>
-				<xs:element name="Offset" type="t:Vector" minOccurs="0">
-					<xs:annotation><xs:documentation>How much offset should be applied per position</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/ShieldAbility.xml

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

resources/Schema/Components/ShieldAbility.xsd

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

resources/Schema/Components/SprintAbility.xml

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

resources/Schema/Components/SprintAbility.xsd

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

@@ -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: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,10 +2,6 @@
 <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>
 
@@ -13,542 +9,138 @@
     <Entity>
       <Components>
         <c:Transform>
-          <Position X="0.100000001" Y="-1.5150001" Z="-3.70500016"/>
-          <Orientation X="0" Y="2.41300011" Z="0"/>
+          <Position X="-0.100000001" Y="-1.11500001" Z="-3.10500026"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
-            <c:DirectionalLight>
-              <Intensity>0</Intensity>
-            </c:DirectionalLight>
+            <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"/>
+              <Orientation X="5.40800047" Y="3.65100026" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Light">
+        <Entity name="Running">
           <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: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>
-              <GlowIntensity>5</GlowIntensity>
-              <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+              <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
             </c:Model>
-            <c:Transform/>
+            <c:Transform>
+              <Position X="-0.690088332" Y="0" Z="0"/>
+            </c:Transform>
           </Components>
           <Children>
-            <Entity name="WeaponAttachment">
+            <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/Blue/AssaultWeaponBlue.mesh</Resource>
+                  <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <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"/>
+                  <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>
-            <Entity name="AimBlend">
+          </Children>
+        </Entity>
+        <Entity>
+          <Components>
+            <c:PointLight>
+              <Color A="1" B="0.70588237" G="0.70588237" R="1"/>
+              <Radius>10</Radius>
+            </c:PointLight>
+            <c:Transform>
+              <Position X="-0.375567257" Y="2.13093901" Z="-0.718547285"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
               <Components>
-                <c:Blend>
-                  <Pose1>AimPrimary</Pose1>
-                  <Pose2>AimSecondary</Pose2>
-                  <Weight>0</Weight>
-                </c:Blend>
-                <c:Transform/>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.70588237" R="0.70588237"/>
+                  <Radius>10</Radius>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-1.96873236" Y="0" Z="0"/>
+                </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>
+              <Children/>
             </Entity>
           </Children>
         </Entity>
-        <Entity name="Plane">
+        <Entity>
           <Components>
             <c:Model>
               <Resource>Models/Core/UnitPlane.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Scale X="5" Y="1" Z="5"/>
+              <Scale X="10" Y="1" Z="10"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="Light">
+        <Entity>
           <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>
+            <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/>
           </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/>
+          <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>
         </Entity>
       </Children>
     </Entity>

resources/Schema/Entities/BlendTreeAim.xml

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

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

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

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

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

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

resources/Schema/Entities/CapturePoint.xml

@@ -4,39 +4,14 @@
   <Components>
     <c:AABB/>
     <c:CapturePoint/>
+    <c:Model>
+      <Resource>Models/Core/UnitSphere.mesh</Resource>
+    </c:Model>
     <c:Team/>
-    <c:Trigger/>
     <c:Transform/>
+    <c:Trigger/>
   </Components>
 
-  <Children>
-    <Entity name="Red">
-      <Components>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Blue">
-      <Components>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Spectator">
-      <Components>
-        <c:Model>
-          <Resource>models/core/unitcube.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
+  <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="Deploy">
+    <Entity name="Shield">
       <Components>
-        <c:Animation>
-          <AnimationName>ActivateDeactiveShieldF</AnimationName>
-          <Time>1</Time>
-          <Speed>1</Speed>
-        </c:Animation>
-        <c:Transform/>
+        <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>
       </Components>
       <Children/>
     </Entity>
-    <Entity name="Idle">
+    <Entity name="VisibleSide">
       <Components>
-        <c:Animation>
-          <AnimationName>ShieldFrontF</AnimationName>
-          <Speed>1</Speed>
-        </c:Animation>
-        <c:Transform/>
+        <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>
       </Components>
       <Children/>
     </Entity>

resources/Schema/Entities/DefenderWeaponView.xml

@@ -3,9 +3,11 @@
 
   <Components>
     <c:Model>
-      <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
     </c:Model>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="0" Y="0.0350000001" Z="-0.295000017"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -32,7 +34,7 @@
     <Entity name="AmmunitionHUD">
       <Components>
         <c:Transform>
-          <Position X="-0.0460000038" Y="0.119000003" Z="-0.162"/>
+          <Position X="-0.0490000024" Y="0.0520000011" Z="-0.063000001"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
       </Components>
@@ -58,16 +60,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>
@@ -76,16 +78,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/DefenderWeaponViewRed.xml

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

@@ -2,10 +2,17 @@
 <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/DefenderWeaponBlue.mesh</Resource>
+      <Resource>Models/Weapons/Blue/DefenderGunBlue.mesh</Resource>
     </c:Model>
-    <c:Transform/>
+    <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>

resources/Schema/Entities/DefenderWeaponWorldRed.xml

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

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

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

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

@@ -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: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.600000024" Y="0" Z="0"/>
+              <Position X="0.800000012" 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.800000012" Y="0" Z="0"/>
+              <Position X="-0.600000024" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>

resources/Schema/Entities/Player.xml

@@ -6,12 +6,11 @@
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
-    <c:AssaultWeapon/>
-    <c:Team>
-      <Team>
-        <Blue/>
-      </Team>
-    </c:Team>
+    <c:AssaultWeapon>
+      <Slot>
+        <Secondary/>
+      </Slot>
+    </c:AssaultWeapon>
     <c:Collidable/>
     <c:DashAbility/>
     <c:DoubleJump/>
@@ -23,6 +22,11 @@
       <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>
@@ -169,40 +173,6 @@
                         </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">
@@ -249,12 +219,12 @@
                   <Children>
                     <Entity name="ProgressionHexagon">
                       <Components>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
                         <c:CapturePointHUD>
                           <CapturePointNumber>2</CapturePointNumber>
                         </c:CapturePointHUD>
+                        <c: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>
@@ -283,12 +253,12 @@
                   <Children>
                     <Entity name="ProgressionHexagon">
                       <Components>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
                         <c:CapturePointHUD>
                           <CapturePointNumber>3</CapturePointNumber>
                         </c:CapturePointHUD>
+                        <c:Fill>
+                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
+                        </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
                           <GlowMap></GlowMap>
@@ -317,13 +287,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>
@@ -352,12 +322,12 @@
                   <Children>
                     <Entity name="ProgressionHexagon">
                       <Components>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
                         <c:CapturePointHUD>
                           <CapturePointNumber>1</CapturePointNumber>
                         </c:CapturePointHUD>
+                        <c: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>
@@ -386,11 +356,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>
@@ -463,15 +433,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"/>
@@ -484,14 +454,16 @@
         </Entity>
         <Entity name="Hands">
           <Components>
-            <c:Blend>
-              <Pose1>BlendTreeAssaultWeapon</Pose1>
-              <Pose2>BlendTreeSecondaryWeapon</Pose2>
-              <Weight>0</Weight>
-              <SubTreeRoot>true</SubTreeRoot>
-            </c:Blend>
+            <c:Animation>
+              <AnimationName1>Idle</AnimationName1>
+              <Time1>1.8348644854054612</Time1>
+              <Speed1>1</Speed1>
+              <AnimationName2></AnimationName2>
+              <AnimationName3></AnimationName3>
+            </c:Animation>
             <c:Model>
-              <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+              <Resource>Models/Characters/Assault/Test/FirstPerson.mesh</Resource>
+              <Color A="1" B="1" G="0.309803933" R="0"/>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -505,11 +477,11 @@
                   <Weapon>AssaultWeapon</Weapon>
                 </c:WeaponAttachment>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/WeaponAssaultBlueView.xml</EntityFile>
+                  <EntityFile>Schema/Entities/AssaultWeaponView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
-                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
+                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
+                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -526,79 +498,12 @@
                   <EntityFile>Schema/Entities/SidearmWeaponView.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.120430678" Y="-0.228860483" Z="-0.181454629"/>
-                  <Orientation X="0.0104048448" Y="-0.00268179015" Z="0.0428442247"/>
+                  <Position X="0.120430619" Y="-0.229639441" Z="-0.181454554"/>
+                  <Orientation X="0.0104045719" Y="-0.00268170005" Z="0.0428441055"/>
                 </c:Transform>
               </Components>
               <Children/>
             </Entity>
-            <Entity name="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>
@@ -622,10 +527,16 @@
     </Entity>
     <Entity name="PlayerModel">
       <Components>
-        <c:BlendAdditive>
-          <Adder>BlendTreeAim</Adder>
-          <Receiver>BlendTreeAssault</Receiver>
-        </c:BlendAdditive>
+        <c:Animation>
+          <AnimationName1>IdleF</AnimationName1>
+          <Speed1>1</Speed1>
+          <AnimationName2></AnimationName2>
+          <AnimationName3></AnimationName3>
+        </c:Animation>
+        <c:AnimationOffset>
+          <AnimationName>AimRifle</AnimationName>
+          <Time>0.5</Time>
+        </c:AnimationOffset>
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
@@ -637,9 +548,6 @@
       <Children>
         <Entity name="PrimaryAttachment">
           <Components>
-            <c:BoneAttachment>
-              <BoneName>R_Arm_Weapon_Joint</BoneName>
-            </c:BoneAttachment>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
               <Person>
@@ -647,12 +555,9 @@
               </Person>
             </c:WeaponAttachment>
             <c:Spawner>
-              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+              <EntityFile>Schema/Entities/AssaultWeaponWorld.xml</EntityFile>
             </c:Spawner>
-            <c:Transform>
-              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
-              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
-            </c:Transform>
+            <c:Transform/>
           </Components>
           <Children/>
         </Entity>
@@ -671,490 +576,12 @@
               <EntityFile>Schema/Entities/SidearmWeaponWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.156692833" Y="1.04078996" Z="-0.230734348"/>
-              <Orientation X="-0.00423099846" Y="-0.0376685001" Z="0.137512475"/>
+              <Position X="0.15691258" Y="1.04389966" Z="-0.213815808"/>
+              <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
-        <Entity name="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

@@ -1,433 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="HUD" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="0" Y="0" Z="-0.5"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Crosshair">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-          <GlowMap></GlowMap>
-          <DepthSort>false</DepthSort>
-        </c:Sprite>
-        <c:Transform>
-          <Position X="0" Y="0" Z="0.200000003"/>
-          <Scale X="0.0250000004" Y="0.0250000004" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="HitMarkerSpawner">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/HitMarker.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="CapturePointHUD">
-      <Components>
-        <c:Transform>
-          <Position X="0" Y="0.190541431" Z="0"/>
-          <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>3</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="1.62788737" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>4</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>2</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="0.300000012" B="1" G="1" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:Fill>
-                  <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                </c:Fill>
-                <c:CapturePointHUD>
-                  <CapturePointNumber>1</CapturePointNumber>
-                </c:CapturePointHUD>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="1.57079637"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="BackgroundHexagon">
-          <Components>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="0.699999988" B="0" G="0" R="1"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="ProgressionHexagon">
-              <Components>
-                <c:Fill>
-                  <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="0" G="0" R="1"/>
-                </c:Fill>
-                <c:CapturePointHUD/>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="0.00999999978"/>
-                  <Orientation X="0" Y="0" Z="4.71238899"/>
-                  <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="KillFeed">
-      <Components>
-        <c:KillFeed/>
-        <c:Transform>
-          <Position X="0.486000031" Y="0.26000002" Z="0"/>
-          <Scale X="0.0149999997" Y="0.0149999997" Z="0.0149999997"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="KillFeed1">
-          <Components>
-            <c:Text>
-              <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Alignment>
-                <Right/>
-              </Alignment>
-            </c:Text>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="KillFeed2">
-          <Components>
-            <c:Text>
-              <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Alignment>
-                <Right/>
-              </Alignment>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="-1" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="KillFeed3">
-          <Components>
-            <c:Text>
-              <Content></Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Alignment>
-                <Right/>
-              </Alignment>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="-2" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="CapturePointArrow">
-      <Components>
-        <c:Team>
-          <Team>
-            <Blue/>
-          </Team>
-        </c:Team>
-        <c:CapturePointArrowHUD/>
-        <c:Model>
-          <Resource>Models/Widgets/Arrows/Arrow5.mesh</Resource>
-        </c:Model>
-        <c:Transform>
-          <Position X="0" Y="0.198665127" Z="0"/>
-          <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="HealthHUDAssault">
-      <Components>
-        <c:Transform>
-          <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-          <Orientation X="5.83699989" Y="0" Z="4.71199989"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="HealthText">
-          <Components>
-            <c:Fill>
-              <Percentage>1</Percentage>
-              <Color A="1" B="1" G="0" R="0"/>
-            </c:Fill>
-            <c:Text>
-              <Content>100/100</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-              <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-            </c:Text>
-            <c:HealthHUD/>
-            <c:Transform>
-              <Position X="0.0200000014" Y="-0.101000004" Z="0.00300000003"/>
-              <Orientation X="0" Y="0" Z="1.57070696"/>
-              <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="HealthBar">
-          <Components>
-            <c:Fill>
-              <Percentage>1</Percentage>
-              <Color A="0.301960796" B="1" G="0" R="0"/>
-            </c:Fill>
-            <c:HealthHUD/>
-            <c:Sprite>
-              <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <Color A="0.588235319" B="0" G="0" R="0"/>
-            </c:Sprite>
-            <c:Transform>
-              <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="BoostIcons">
-          <Components>
-            <c:BoostIconsHUD/>
-            <c:Transform>
-              <Position X="0" Y="0.00500000035" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="Assault">
-              <Components>
-                <c:Fill>
-                  <Color A="1" B="0.533333361" G="1" R="0.329411775"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Assault-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.0392156877" G="0.184313729" R="0"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0.0250000004" Y="0.0700000003" Z="0"/>
-                  <Orientation X="0" Y="0" Z="3.14199996"/>
-                  <Scale X="0.0399999991" Y="0.0399999991" Z="0.5"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Defender">
-              <Components>
-                <c:Fill>
-                  <Color A="1" B="1" G="0.58431375" R="0.105882354"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Defender-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.34117648" G="0.192156866" R="0"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0.0270000007" Y="0.110000007" Z="0"/>
-                  <Orientation X="0" Y="0" Z="3.14199996"/>
-                  <Scale X="0.0399999991" Y="0.0400000028" Z="0.165000007"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-            <Entity name="Sniper">
-              <Components>
-                <c:Fill>
-                  <Color A="1" B="0.345098048" G="0" R="1"/>
-                </c:Fill>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Icons/Boosts/Sniper-01.png</DiffuseTexture>
-                  <GlowMap></GlowMap>
-                  <DepthSort>false</DepthSort>
-                  <Color A="0" B="0.121568628" G="0" R="0.443137258"/>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0.0250000004" Y="0.145000011" Z="0"/>
-                  <Orientation X="0" Y="0" Z="3.14199996"/>
-                  <Scale X="0.0400000028" Y="0.0400000028" Z="0.165000007"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="ShiftAbility">
-          <Components>
-            <c:AbilityCooldownHUD/>
-            <c:Fill>
-              <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
-            </c:Fill>
-            <c:Sprite>
-              <DiffuseTexture>Textures/Icons/Abilities/Superman-01.png</DiffuseTexture>
-              <GlowMap></GlowMap>
-              <DepthSort>false</DepthSort>
-              <Color A="1" B="0.206628323" G="0.78039217" R="0.192802757"/>
-            </c:Sprite>
-            <c:Transform>
-              <Position X="0.0250000004" Y="0.0100000007" Z="0"/>
-              <Orientation X="0" Y="0" Z="3.14159203"/>
-              <Scale X="0.0800000057" Y="0.0700000003" Z="1"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/PlayerModel.xml

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

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

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

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

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

@@ -1,119 +0,0 @@
-<?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.155832842" Y="1.12994993" Z="-0.201626897"/>
+          <Position X="0.47420007" Y="0.928898275" Z="0.0299553983"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.100000001"/>
-          <Orientation X="0.195066273" Y="-0.0870126858" Z="0.148657113"/>
+          <Orientation X="1.60548508" Y="-1.10789871" Z="-1.51772225"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -29,17 +29,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Hand</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -48,17 +47,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Arm</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -67,17 +65,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -86,17 +83,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Neck</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -105,17 +101,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_3</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -124,17 +119,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_2</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -143,17 +137,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Spine_1</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -162,17 +155,15 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Hip</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="19.6078434"/>
         </c:Model>
         <c:Transform>
-          <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"/>
+          <Position X="0" Y="0.901226044" Z="0"/>
+          <Scale X="0.100000001" Y="0.0500000007" Z="0.0500000007"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -181,17 +172,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Top</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.0688988566" Y="0.704185605" Z="-0.0198653266"/>
+          <Position X="-0.0735318959" Y="0.86343354" Z="0.00186898722"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.124463096" Y="0.178934589" Z="0.0281526987"/>
+          <Orientation X="0.431212306" Y="-0.0456388369" Z="-0.00236316444"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -200,17 +190,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.0895988718" Y="0.340622783" Z="0.022300493"/>
+          <Position X="-0.0971027464" Y="0.534537971" Z="-0.158307418"/>
           <Scale X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <Orientation X="-0.634849846" Y="0.204822823" Z="0.0869619399"/>
+          <Orientation X="-0.435873091" Y="0.0584642813" Z="-0.0526505522"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -219,17 +208,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Foot</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -238,17 +226,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Toe</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -257,17 +244,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -276,17 +262,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Arm</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -295,17 +280,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Hand</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -314,17 +298,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -333,17 +316,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Chin</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -352,17 +334,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Head</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -371,17 +352,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>Perietal</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -390,17 +370,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>L_Elbow</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </c:BoneAttachment>
         <c:Model>
           <Resource>Models/Core/UnitCube.mesh</Resource>
           <Color A="1" B="1" G="19.6078434" R="1"/>
         </c:Model>
         <c:Transform>
-          <Position X="-0.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -409,17 +388,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Bottom</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -428,17 +406,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Elbow</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -447,17 +424,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Leg_Top</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -466,17 +442,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Foot</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -485,17 +460,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Toe</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -504,17 +478,16 @@
       <Components>
         <c:BoneAttachment>
           <BoneName>R_Shoulder_Armor_Joint</BoneName>
-          <ScaleOffset X="0.0500000007" Y="0.0500000007" Z="0.0500000007"/>
-          <InheritScale>true</InheritScale>
+          <ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
         </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.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"/>
+          <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"/>
         </c:Transform>
       </Components>
       <Children/>

resources/Schema/Entities/Spawnpoint

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

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

@@ -0,0 +1,45 @@
+<?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,12 +98,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="ReloadEffect">
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponAssaultRedView.xml

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

resources/Schema/Entities/aim_rays.xml

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

resources/Schema/Entities/aim_rays_with_capturep.xml

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

resources/Schema/Entities/ble

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

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

@@ -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: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,12 +43,10 @@
 							<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"/>
@@ -66,8 +64,6 @@
 							<xs:element ref="c:HealthHUD" minOccurs="0"/>
 							<xs:element ref="c:SpriteIndicator" minOccurs="0"/>
 							<xs:element ref="c:InputCmdButton" minOccurs="0"/>
-							<xs:element ref="c:ScoreScreen" minOccurs="0"/>
-							<xs:element ref="c:ScoreIdentity" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/ForwardPlus.frag.glsl

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

resources/Shaders/ForwardPlusShieldCheck.frag.glsl

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