fixed bug in Client::parsePlayerDamage

include/Engine/Collision/Collision.h

@@ -78,21 +78,13 @@ bool AABBvsTriangles(const AABB& box,
     bool& isOnGround,
     glm::vec3& outResolutionVector);
 
-//Detects collision, but does not resolve.
-bool AABBvsTriangles(const AABB& box,
-    const RawModel::Vertex* modelVertices,
-    const std::vector<unsigned int>& modelIndices,
-    const glm::mat4& modelMatrix);
-
 //Return true if the boxes are intersecting.
 bool AABBVsAABB(const AABB& a, const AABB& b);
 //Return true if the boxes are intersecting.
 //Also outputs the minimum translation that box [a] would need in order to resolve collision.
 bool AABBVsAABB(const AABB& a, const AABB& b, glm::vec3& minimumTranslation);
 
-// Calculates an absolute AABB from an entity AABB component or Model component.
-// if takeModelBox is true, the AABB component will be ignored and box is calculated from Model.
-// if takeModelBox is false, the AABB component will be prefered, if it exists.
+// Calculates an absolute AABB from an entity AABB component
 boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity, bool takeModelBox = false);
 boost::optional<EntityAABB> AbsoluteAABBExplosionEffect(EntityWrapper& entity);
 //Returns the first entity hit by the input ray. entitiesPotentiallyHitSorted needs to be sorted 

include/Engine/Collision/CollisionSystem.h

@@ -15,11 +15,11 @@ class CollisionSystem : public PureSystem
 public:
     CollisionSystem(SystemParams params, Octree<EntityAABB>* octree)
         : System(params)
-        , PureSystem("Physics")
+        , PureSystem("Collidable")
         , m_Octree(octree)
     { }
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPhysics, double dt) override;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
     Octree<EntityAABB>* m_Octree;

include/Engine/Core/ComponentInfo.h

@@ -2,7 +2,6 @@
 #define ComponentInfo_h__
 
 #include "../Common.h"
-#include <boost/shared_array.hpp>
 
 struct ComponentInfo
 {
@@ -28,9 +27,8 @@ struct ComponentInfo
 	std::string Name;
     std::unordered_map<std::string, Field_t> Fields;
     std::vector<std::string> FieldsInOrder;
-    std::vector<std::string> StringFields;
     unsigned int Stride = 0;
-    boost::shared_array<char> Defaults = nullptr;
+    std::shared_ptr<char> Defaults = nullptr;
 	std::shared_ptr<Meta_t> Meta = nullptr;
 };
 

include/Engine/Core/ComponentPool.h

@@ -1,7 +1,6 @@
 #ifndef ComponentPool_h__
 #define ComponentPool_h__
 
-#include <set>
 #include "MemoryPool.h"
 #include "ComponentInfo.h"
 #include "ComponentWrapper.h"
@@ -46,8 +45,7 @@ public:
         : m_ComponentInfo(ci)
         , m_Pool(ci.Meta->Allocation, sizeof(EntityID) + ci.Stride)
     { }
-    ~ComponentPool();
-	ComponentPool(const ComponentPool& other);
+	ComponentPool(const ComponentPool& other) = delete;
 	ComponentPool(const ComponentPool&& other) = delete;
 
     const ::ComponentInfo& ComponentInfo() const { return m_ComponentInfo; }

include/Engine/Core/ComponentWrapper.h

@@ -2,29 +2,11 @@
 #define ComponentWrapper_h__
 
 #include <boost/shared_array.hpp>
-#include <boost/any.hpp>
 #include "../Common.h"
 #include "Entity.h"
 #include "ComponentInfo.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)
@@ -65,31 +47,7 @@ struct ComponentWrapper
 
     void Copy(ComponentWrapper& destination)
     {
-        // Copy trivial data
-        memcpy(destination.Data, Data, Info.Stride);
-        // Duplicate strings
-        SolidifyStrings(destination);
-    }
-
-    // When component data has been copied, strings need to be reconstructed or they'll refer to the same data!
-    static void SolidifyStrings(ComponentWrapper& component)
-    {
-        for (auto& name : component.Info.StringFields) {
-            std::size_t offset = component.Info.Fields.at(name).Offset;
-            std::string value = *reinterpret_cast<const std::string*>(component.Data + offset);
-            new (component.Data + offset) std::string(value);
-        }
-    }
-
-    // This needs to be called to properly free component data, because strings.
-    static void Destroy(ComponentInfo info, char* data)
-    {
-        // Call std::string destructors
-        for (auto& name : info.StringFields) {
-            std::size_t offset = info.Fields.at(name).Offset;
-            auto field = reinterpret_cast<std::string*>(data + offset);
-            field->~basic_string();
-        }
+        memcpy(destination.Data, this->Data, Info.Stride);
     }
     
     struct SubscriptProxy
@@ -144,38 +102,26 @@ public:
     ComponentWrapperFactory(std::string componentTypeName, unsigned int allocation = 0)
     {
         m_ComponentInfo.Name = componentTypeName;
-        m_ComponentInfo.Meta = std::make_shared<ComponentInfo::Meta_t>();
         m_ComponentInfo.Meta->Allocation = allocation;
     }
 
     template <typename T>
     void AddProperty(std::string fieldName, T defaultValue)
     {
-        auto& field = m_ComponentInfo.Fields[fieldName];
-        field.Name = fieldName;
-        field.Type = typeid(T).name();
-        field.Offset = m_ComponentInfo.Stride;
-        field.Stride = sizeof(T);
-        m_ComponentInfo.FieldsInOrder.push_back(field.Name);
-        if (field.Type == typeid(std::string).name()) {
-            field.Type = "string";
-            m_ComponentInfo.StringFields.push_back(field.Name);
-        }
+        m_DefaultValues.push_back(defaultValue);
+        m_ComponentInfo.Fields[fieldName].Type = typeid(T).name();
+        m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Stride;
+        m_ComponentInfo.Fields[fieldName].Stride = sizeof(T);
         m_ComponentInfo.Stride += sizeof(T);
-        m_DefaultValues.push_back(std::make_pair(field, defaultValue));
     }
-
+    
     ComponentInfo& Finalize()
     {
-        m_ComponentInfo.Defaults = boost::shared_array<char>(new char[m_ComponentInfo.Stride]);
+        m_ComponentInfo.Defaults = std::shared_ptr<char>(new char[m_ComponentInfo.Stride]);
         std::size_t offset = 0;
-        for (auto& pair : m_DefaultValues) {
-            if (pair.first.Type == "string") {
-                new (m_ComponentInfo.Defaults.get() + offset) std::string(*reinterpret_cast<std::string*>(pair.second.Data.get()));
-            } else {
-                memcpy(m_ComponentInfo.Defaults.get() + offset, pair.second.Data.get(), pair.second.Size);
-            }
-            offset += pair.second.Size;
+        for (auto& val : m_DefaultValues) {
+            memcpy(m_ComponentInfo.Defaults.get() + offset, val.Data.get(), val.Size);
+            offset += val.Size;
         }
 
         return m_ComponentInfo;
@@ -185,7 +131,7 @@ public:
 
 private:
     ComponentInfo m_ComponentInfo;
-    std::vector<std::pair<ComponentInfo::Field_t, Any>> m_DefaultValues;
+    std::vector<Any> m_DefaultValues;
 };
 
 #endif

include/Engine/Core/EntityWrapper.h

@@ -29,7 +29,6 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
-    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
@@ -40,7 +39,6 @@ struct EntityWrapper
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
-    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };
 
 namespace std

include/Engine/Core/MemoryPool.h

@@ -66,25 +66,9 @@ public:
 		, m_LowestAllocatedSlot(m_NumSlots)
 	{ }
 
-    MemoryPool(const MemoryPool<T>& other)
-		: m_StartAddress(new char[other.m_NumSlots*other.m_Stride])
-		, m_SlotIsAllocated(other.m_SlotIsAllocated)
-        , m_ExtraMemory()
-		, m_NumSlots(other.m_NumSlots)
-		, m_LowestAllocatedSlot(other.m_LowestAllocatedSlot)
-		, m_NumAllocatedSlots(other.m_NumAllocatedSlots)
-		, m_Stride(other.m_Stride)
-		, m_CurrentAllocSlot(other.m_CurrentAllocSlot)
-    {
-        // Copy statically allocated pool
-        memcpy(m_StartAddress, other.m_StartAddress, m_NumSlots*m_Stride);
-        // Copy dynamically allocated memory
-        for (char* otherAddr : other.m_ExtraMemory) {
-            char* addr = (char*)malloc(m_Stride);
-            memcpy(addr, otherAddr, m_Stride);
-            m_ExtraMemory.push_back(addr);
-        }
-    }
+	//We may get problems with memory being released 
+	//prematurely, etc. if we allow copies.
+	MemoryPool(const MemoryPool<T>& other) = delete;
 	MemoryPool(const MemoryPool<T>&& other) = delete;
 
 	//Free all memory that has been allocated.
@@ -94,9 +78,8 @@ public:
 			delete[] m_StartAddress;
 			m_StartAddress = nullptr;
 		}
-        for (char* addr : m_ExtraMemory) {
-            free(addr);
-        }
+		for (char* addr : m_ExtraMemory)
+			free(addr);
 		m_ExtraMemory.clear();
 	}
 

include/Engine/Core/PerformanceTimer.h

@@ -1,25 +0,0 @@
-#ifndef PerformanceTimer_h__
-#define PerformanceTimer_h__
-
-#include "../Common.h"
-#include <boost/timer/timer.hpp>
-using boost::timer::cpu_timer;
-
-class PerformanceTimer
-{
-public:
-    static void StartTimer(std::string nameOfTimer);
-    static void StartTimerAndStopPrevious(std::string nameOfTimer);
-    static void StopTimer(std::string nameOfTimer);
-    static void SetFrameNumber(int frameNumber);
-
-    static void ResetAllTimers();
-    static void CreateExcelData();
-
-private:
-    static std::map<std::string, cpu_timer> timers;
-    static cpu_timer m_Timer;
-    static std::string currentTimerRunning;
-};
-
-#endif

include/Engine/Core/SystemPipeline.h

@@ -6,7 +6,6 @@
 #include "System.h"
 #include "World.h"
 #include "EPause.h"
-#include "PerformanceTimer.h"
 
 class SystemPipeline
 {
@@ -73,10 +72,7 @@ public:
 
             // Update
             for (auto& system : group.ImpureSystems) {
-                auto className = (std::string)typeid(*system).name();
-                PerformanceTimer::StartTimer(className);
                 system->Update(dt);
-                PerformanceTimer::StopTimer(className);
             }
             for (auto& pair : group.PureSystems) {
                 const std::string& componentName = pair.first;
@@ -87,10 +83,7 @@ public:
                 }
                 for (auto& component : *pool) {
                     for (auto& system : systems) {
-                        auto className = (std::string)typeid(*system).name();
-                        PerformanceTimer::StartTimer(className);
                         system->UpdateComponent(EntityWrapper(m_World, component.EntityID), component, dt);
-                        PerformanceTimer::StopTimer(className);
                     }
                 }
             }
@@ -113,9 +106,9 @@ private:
     std::vector<UnorderedSystems> m_OrderedSystemGroups;
 
     EventRelay<SystemPipeline, Events::Pause> m_EPause;
-    bool OnPause(const Events::Pause& e) {
-        if (e.World == m_World) {
-            m_Paused = true;
+    bool OnPause(const Events::Pause& e) { 
+        if (e.World == m_World) { 
+            m_Paused = true; 
         }
         return true;
     }

include/Engine/Core/Util/Any.h

@@ -2,7 +2,6 @@
 #define Util_Any_h__
 
 #include <memory>
-#include <boost/shared_array.hpp>
 
 struct Any
 {
@@ -11,7 +10,7 @@ struct Any
     template <typename T>
     Any(const T& value)
     {
-        Data = boost::shared_array<char>(new char[sizeof(T)]);
+        Data = std::shared_ptr<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -19,7 +18,7 @@ struct Any
     template <typename T>
     Any(T&& value)
     {
-        Data = boost::shared_array<char>(new char[sizeof(T)]);
+        Data = std::shared_ptr<char>(new char[sizeof(T)]);
         Size = sizeof(T);
         memcpy(Data.get(), &value, Size);
     }
@@ -36,7 +35,7 @@ struct Any
         return Any(value);
     }
 
-    boost::shared_array<char> Data = nullptr;
+    std::shared_ptr<char> Data = nullptr;
     std::size_t Size = 0;
 };
 

include/Engine/Core/World.h

@@ -15,7 +15,6 @@ public:
         : m_EventBroker(eventBroker)
     { }
     ~World();
-    World(const World& other);
 
     // Create empty entity
     EntityID CreateEntity(EntityID parent = 0);

include/Engine/GUI/Button.h

@@ -0,0 +1,165 @@
+#ifndef GUI_BUTTON_H__
+#define GUI_BUTTON_H__
+
+#include "GUI/TextureFrame.h"
+#include "GUI/EButtonEnter.h"
+#include "GUI/EButtonLeave.h"
+#include "GUI/EButtonPress.h"
+#include "GUI/EButtonRelease.h"
+#include "Core/EMouseMove.h"
+#include "Core/EMousePress.h"
+#include "Core/EMouseRelease.h"
+
+namespace dd
+{
+namespace GUI
+{
+
+class Button : public TextureFrame
+{
+public:
+	Button(Frame* parent, std::string name)
+		: TextureFrame(parent, name)
+	{
+		EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &Button::OnMouseMove);
+		EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &Button::OnMousePress);
+		EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &Button::OnMouseRelease);
+	}
+
+	void SetTextureHover(std::string resourceName)
+	{
+		m_TextureHover = resourceName;
+	}
+	void SetTextureReleased(std::string resourceName)
+	{
+		m_TextureReleased = resourceName;
+		SetTexture(resourceName);
+	}
+	void SetTexturePressed(std::string resourceName)
+	{
+		m_TexturePressed = resourceName;
+	}
+
+	void Draw(RenderScene& rq) override
+	{
+		if (m_Texture == nullptr && !m_TextureReleased.empty()) {
+			SetTexture(m_TextureReleased);
+		}
+
+		TextureFrame::Draw(rq);
+	}
+
+	virtual void OnEnter() { }
+	virtual void OnLeave() { }
+	virtual void OnPress() { }
+	virtual void OnRelease() { }
+
+protected:
+	bool m_MouseIsOver = false;
+	bool m_IsDown = false;
+
+	virtual bool OnMouseMove(const Events::MouseMove& event)
+	{
+		if (Hidden()) {
+			return false;
+		}
+
+		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
+		if (isOver && !m_MouseIsOver) { // Enter
+			if (!m_IsDown) {
+				if (!m_TextureHover.empty()) {
+					SetTexture(m_TextureHover);
+				}
+			}
+			OnEnter();
+			Events::ButtonEnter e;
+			e.FrameName = m_Name;
+			EventBroker->Publish(e);
+			Events::PlaySound soundEvent;
+			soundEvent.FilePath = "Sounds/GUI/hover-n.wav";
+			EventBroker->Publish(soundEvent);
+			
+		} else if (!isOver && m_MouseIsOver) { // Leave
+			if (!m_IsDown) {
+				if (!m_TextureReleased.empty()) {
+					SetTexture(m_TextureReleased);
+				}
+			}
+			OnLeave();
+			Events::ButtonLeave e;
+			e.FrameName = m_Name;
+			EventBroker->Publish(e);
+		}
+		m_MouseIsOver = isOver;
+
+		return true;
+	}
+	virtual bool OnMousePress(const Events::MousePress& event)
+	{
+		if (Hidden()) {
+			//LOG_DEBUG("Pressed hidden button");
+			return false;
+		}
+
+		if (!Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1))) {
+			return false;
+		}
+
+		if (!m_TexturePressed.empty()) {
+			SetTexture(m_TexturePressed);
+		}
+
+		m_IsDown = true;
+		OnPress();
+		Events::ButtonPress e;
+		e.FrameName = m_Name;
+		e.Button = this;
+		EventBroker->Publish(e);
+
+		return true;
+	}
+	virtual bool OnMouseRelease(const Events::MouseRelease& event)
+	{
+		if (Hidden()) {
+			//LOG_DEBUG("Released hidden button");
+			return false;
+		}
+
+		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
+		if (!isOver && !m_IsDown) {
+			return false;
+		}
+
+		if (m_MouseIsOver) {
+			if (!m_TextureHover.empty()) {
+				SetTexture(m_TextureHover);
+			}
+		} else {
+			if (!m_TextureReleased.empty()) {
+				SetTexture(m_TextureReleased);
+			}
+		}
+
+		m_IsDown = false;
+		OnRelease();
+		Events::ButtonRelease e;
+		e.FrameName = m_Name;
+		e.Button = this;
+		EventBroker->Publish(e);
+
+		return true;
+	}
+
+private:
+	EventRelay<Frame, Events::MouseMove> m_EMouseMove;
+	EventRelay<Frame, Events::MousePress> m_EMousePress;
+	EventRelay<Frame, Events::MouseRelease> m_EMouseRelease;
+
+	std::string m_TextureHover;
+	std::string m_TexturePressed;
+	std::string m_TextureReleased;
+};
+
+}
+}
+#endif

include/Engine/GUI/ButtonSystem.h

@@ -1,44 +0,0 @@
-#ifndef ButtonSystem_h__
-#define ButtonSystem_h__
-
-#include "../Rendering/IRenderer.h"
-#include "../Core/ConfigFile.h"
-#include "../Rendering/PickingPass.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/System.h"
-#include "../Core/Event.h"
-#include "../Core/EMousePress.h"
-#include "../Core/EMouseRelease.h"
-#include "../Core/ELockMouse.h"
-
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
-#include "EButtonClicked.h"
-
-
-class ButtonSystem : public PureSystem
-{
-public:
-    ButtonSystem(SystemParams params, IRenderer* renderer);
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
-private:
-    IRenderer* m_Renderer;
-    bool m_MouseIsLocked = false;
-
-    EntityWrapper m_PickEntity = EntityWrapper::Invalid;
-    PickData m_PickData;
-
-    EventRelay<ButtonSystem, Events::LockMouse> m_EMouseLock;
-    bool OnMouseLock(const Events::LockMouse& e);
-    EventRelay<ButtonSystem, Events::UnlockMouse> m_EMouseUnlock;
-    bool OnMouseUnlock(const Events::UnlockMouse& e);
-
-    EventRelay<ButtonSystem, Events::MousePress> m_EMousePress;
-    bool OnMousePress(const Events::MousePress& e);
-    EventRelay<ButtonSystem, Events::MouseRelease> m_EMouseRelease;
-    bool OnMouseRelease(const Events::MouseRelease& e);
-};
-
-
-
-#endif

include/Engine/GUI/EButtonClicked.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonClicked_h__
-#define Events_ButtonClicked_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonClicked : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/EButtonEnter.h

@@ -0,0 +1,17 @@
+#ifndef Events_ButtonEnter_h__
+#define Events_ButtonEnter_h__
+
+#include "../Core/EventBroker.h"
+
+namespace Events
+{
+
+/** Thrown on GUI button hover. */
+struct ButtonEnter : Event
+{
+	std::string FrameName;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonLeave.h

@@ -0,0 +1,17 @@
+#ifndef Events_ButtonLeave_h__
+#define Events_ButtonLeave_h__
+
+#include "../Core/EventBroker.h"
+
+namespace Events
+{
+
+/** Thrown on GUI button hover. */
+struct ButtonLeave : Event
+{
+	std::string FrameName;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonPress.h

@@ -0,0 +1,20 @@
+#ifndef Events_ButtonPress_h__
+#define Events_ButtonPress_h__
+
+#include "../Core/EventBroker.h"
+
+namespace GUI { class Button; }
+
+namespace Events
+{
+
+/** Thrown on GUI button press. */
+struct ButtonPress : Event
+{
+	std::string FrameName;
+	GUI::Button* Button;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonPressed.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonPressed_h__
-#define Events_ButtonPressed_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonPressed : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/EButtonRelease.h

@@ -0,0 +1,20 @@
+#ifndef Events_ButtonRelease_h__
+#define Events_ButtonRelease_h__
+
+#include "../Core/EventBroker.h"
+
+namespace GUI { class Button; }
+
+namespace Events
+{
+
+/** Thrown on GUI button release. */
+struct ButtonRelease : Event
+{
+	std::string FrameName;
+	GUI::Button* Button;
+};
+
+}
+
+#endif

include/Engine/GUI/EButtonReleased.h

@@ -1,16 +0,0 @@
-#ifndef Events_ButtonReleased_h__
-#define Events_ButtonReleased_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct ButtonReleased : public Event {
-    std::string EntityName;
-    EntityWrapper Entity;
-};
-
-}
-
-#endif

include/Engine/GUI/Frame.h

@@ -0,0 +1,261 @@
+#ifndef GUI_Frame_h__
+#define GUI_Frame_h__
+
+#include "../Common.h"
+#include "../Core/Util/Rectangle.h"
+#include "../Core/EventBroker.h"
+#include "../Core/EKeyDown.h"
+#include "../Core/EKeyUp.h"
+#include "../Core/ResourceManager.h"
+#include "../Rendering/RenderQueue.h"
+#include "../Rendering/Texture.h"
+#include "../Input/EInputCommand.h"
+
+namespace GUI
+{
+
+class Frame : public Rectangle
+{
+public:
+	enum class Anchor
+	{
+		Left,
+		Right,
+		Top,
+		Bottom
+	};
+
+	static const int BaseWidth = 1280;
+	static const int BaseHeight = 720;
+
+	// Set up a base frame with an event broker
+	Frame(EventBroker* eventBroker)
+		: m_EventBroker(eventBroker)
+		, BaseFrame(this)
+		, m_Name("UIParent")
+		, Rectangle() { }
+
+	// Create a frame as a child
+	Frame(Frame* parent, std::string name)
+		: m_Name(name)
+	{
+		SetParent(parent);
+		Width = parent->Width;
+		Height = parent->Height;
+		EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &Frame::OnKeyDown);
+		EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &Frame::OnKeyUp);
+		EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Frame::OnCommand);
+	}
+
+	~Frame()
+	{
+		/*for (auto layer : m_Children)
+		{
+			for (auto child : layer.second)
+			{
+				delete child.second;
+			}
+		}
+
+		if (m_Parent)
+		{
+			m_Parent->RemoveChild(this);
+		}*/
+	}
+
+	Frame* Parent() const { return m_Parent; }
+
+	void SetParent(Frame* parent)
+	{
+		if (parent == nullptr) {
+			LOG_ERROR("Failed to parent frame \"%s\": Invalid parent", m_Name.c_str());
+			return;
+		}
+
+		m_Layer = parent->Layer() + 1;
+		parent->AddChild(this);
+		m_Parent = parent;
+		m_EventBroker = parent->m_EventBroker;
+		BaseFrame = parent->BaseFrame;
+	}
+
+	void AddChild(Frame* child)
+	{
+		m_Children[child->m_Layer].insert(std::make_pair(child->Name(), child));
+		if (m_Parent) {
+			m_Parent->AddChild(child);
+		}
+	}
+
+	void RemoveChild(Frame* child)
+	{
+		auto it = m_Children.find(child->m_Layer);
+		if (it != m_Children.end()) {
+			m_Children.erase(it);
+		}
+
+		if (m_Parent) {
+			m_Parent->RemoveChild(child);
+		}
+	}
+
+	std::string Name() const { return m_Name; }
+	void SetName(std::string val) { m_Name = val; }
+
+	int Layer() const { return m_Layer; }
+
+	bool Hidden() const
+	{
+		if (m_Parent)
+			return m_Parent->Hidden() || m_Hidden;
+		else
+			return m_Hidden;
+	}
+	bool Visible() const
+	{
+		return !Hidden();
+	}
+
+	virtual void Hide() { m_Hidden = true; }
+	virtual void Show() { m_Hidden = false; }
+
+	int Left() const override
+	{
+		if (m_Parent)
+			return m_Parent->Left() + X;
+		else
+			return X;
+	}
+	void SetLeft(int absLeft) override
+	{
+		if (m_Parent) {
+			X = absLeft - m_Parent->Left();
+		} else {
+			X = absLeft;
+		}
+	}
+	int Right() const override
+	{
+		return Left() + Width;
+	}
+	void SetRight(int absRight) override
+	{
+		if (m_Parent) {
+			X = absRight - Width - m_Parent->Left();
+		} else {
+			X = absRight - Width;
+		}
+	}
+	int Top() const override
+	{
+		if (m_Parent)
+			return m_Parent->Top() + Y;
+		else
+			return Y;
+	}
+	void SetTop(int absTop) override
+	{
+		if (m_Parent) {
+			Y = absTop - m_Parent->Top();
+		} else {
+			Y = absTop;
+		}
+	}
+	int Bottom() const override
+	{
+		return Top() + Height;
+	}
+	void SetBottom(int absBottom) override
+	{
+		if (m_Parent) {
+			Y = absBottom - Height - m_Parent->Top();
+		} else {
+			Y = absBottom - Height;
+		}
+	}
+
+	glm::vec2 Scale()
+	{
+		if (m_Parent)
+			return m_Parent->Scale();
+		else
+			return glm::vec2(Width, Height) / glm::vec2(BaseWidth, BaseHeight);
+	}
+
+	Rectangle AbsoluteRectangle()
+	{
+		int left = Left();
+		if (m_Parent)
+			left = std::max(left, m_Parent->Left());
+		int top = Top();
+		if (m_Parent)
+			top = std::max(top, m_Parent->Top());
+		int width = Right() - left;
+		int height = Bottom() - top;
+		return Rectangle(left, top, width, height);
+	}
+
+	void UpdateLayered(double dt)
+	{
+		// Update ourselves
+		this->Update(dt);
+
+		// Update children
+		for (auto& pairLayer : m_Children) {
+			auto children = pairLayer.second;
+			for (auto& pairChild : children) {
+				auto child = pairChild.second;
+				child->Update(dt);
+			}
+		}
+	}
+
+	virtual void Update(double dt) { }
+
+	void DrawLayered(RenderScene& rq)
+	{
+		if (this->Hidden())
+			return;
+
+		// Draw ourselves
+		this->Draw(rq);
+
+		// Draw children
+		for (auto& pairLayer : m_Children) {
+			auto children = pairLayer.second;
+			for (auto& pairChild : children) {
+				auto child = pairChild.second;
+				if (child->Hidden())
+					continue;
+				child->Draw(rq);
+			}
+		}
+	}
+
+	virtual void Draw(RenderScene& rq) { }
+
+protected:
+	::EventBroker* m_EventBroker;
+	Frame* BaseFrame = nullptr;
+
+	std::string m_Name = "Unnamed";
+	int m_Layer = 0;
+	bool m_Hidden = false;
+
+	Frame* m_Parent = nullptr;
+	typedef std::multimap<std::string, Frame*> Children_t; // name -> frame
+	std::map<int, Children_t> m_Children; // layer -> Children_t
+
+	virtual bool OnKeyDown(const Events::KeyDown& event) { return false; }
+	virtual bool OnKeyUp(const Events::KeyUp& event) { return false; }
+	virtual bool OnCommand(const Events::InputCommand& event) { return false; }
+
+private:
+	EventRelay<Frame, Events::KeyDown> m_EKeyDown;
+	EventRelay<Frame, Events::KeyUp> m_EKeyUp;
+	EventRelay<Frame, Events::InputCommand> m_EInputCommand;
+};
+
+}
+
+#endif

include/Engine/GUI/MainMenuSystem.h

@@ -1,33 +0,0 @@
-#ifndef MainMenuSystem_h__
-#define MainMenuSystem_h__
-
-#include "../Core/System.h"
-#include "../Rendering/IRenderer.h"
-#include "../Core/ResourceManager.h"
-#include "../Core/Event.h"
-
-
-#include "EButtonClicked.h"
-#include "EButtonPressed.h"
-#include "EButtonReleased.h"
-
-
-class MainMenuSystem : public ImpureSystem
-{
-public:
-    MainMenuSystem(SystemParams params, IRenderer* renderer);
-    virtual void Update(double dt) override;
-
-private:
-    IRenderer* m_Renderer;
-
-    EventRelay<MainMenuSystem, Events::ButtonClicked> m_EClicked;
-    bool OnButtonClick(const Events::ButtonClicked& e);
-    EventRelay<MainMenuSystem, Events::ButtonReleased> m_EReleased;
-    bool OnButtonRelease(const Events::ButtonReleased& e);
-    EventRelay<MainMenuSystem, Events::ButtonPressed> m_EPressed;
-    bool OnButtonPress(const Events::ButtonPressed& e);
-
-};
-
-#endif

include/Engine/GUI/TextureFrame.h

@@ -0,0 +1,112 @@
+#ifndef GUI_TextureFrame_h__
+#define GUI_TextureFrame_h__
+
+#include "Frame.h"
+#include "../Rendering/Texture.h"
+#include "../Rendering/Util/CommonFunctions.h"
+
+namespace GUI
+{
+
+class TextureFrame : public Frame
+{
+public:
+	TextureFrame(Frame* parent, std::string name)
+		: Frame(parent, name) { }
+
+	void EnableScissor() { m_ScissorEnabled = true; }
+	void DisableScissor() { m_ScissorEnabled = false; }
+
+	void Draw(RenderScene& rq) override
+	{
+		if (m_Texture == nullptr)
+			return;
+
+		// Texture while fading
+		if (m_FadeTexture && m_CurrentFade < 1) {
+			FrameJob job;
+			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
+			job.Viewport = Rectangle(Left(), Top(), Width, Height);
+			job.TextureID = m_FadeTexture->ResourceID;
+			job.DiffuseTexture = m_FadeTexture;
+			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a);
+			job.Name = Name();
+			rq.GUI.Add(job);
+		}
+
+		// Main texture
+		{
+			FrameJob job;
+			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
+			job.Viewport = Rectangle(Left(), Top(), Width, Height);
+			job.TextureID = m_Texture->ResourceID;
+			job.DiffuseTexture = m_Texture;
+			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a * m_CurrentFade);
+			job.Name = Name();
+			rq.GUI.Add(job);
+		}
+	}
+
+	std::string Texture() const { return m_TextureName; }
+
+	void SetTexture(std::string resourceName)
+	{
+		if (resourceName.empty()) {
+			m_Texture = nullptr;
+			return;
+		}
+
+		m_Texture = CommonFunctions::LoadTexture(resourceName, false);
+		m_TextureName = resourceName;
+		if (m_Texture == nullptr) {
+			m_Texture = CommonFunctions::LoadTexture("Textures/Core/ErrorTexture.png", false);
+		}
+
+		SizeToTexture();
+	}
+
+	void SizeToTexture()
+	{
+		if (m_Texture != nullptr) {
+			this->Width = m_Texture->Width;
+			this->Height = m_Texture->Height;
+		}
+	}
+
+	void FadeToTexture(std::string resourceName, double duration)
+	{
+		m_FadeTexture = m_Texture;
+		SetTexture(resourceName);
+		m_FadeDuration = duration;
+		m_CurrentFade = 0.f;
+	}
+
+	void Update(double dt) override
+	{
+		if (m_CurrentFade < 1) {
+			m_CurrentFade += dt / m_FadeDuration;
+			if (m_CurrentFade > 1) {
+				m_FadeTexture = nullptr;
+				m_CurrentFade = 1;
+				m_FadeDuration = 0;
+			}
+		}
+	}
+
+	glm::vec4 Color() const { return m_Color; }
+	void SetColor(glm::vec4 val) { m_Color = val; }
+
+protected:
+	bool m_ScissorEnabled = true;
+	Texture* m_Texture = nullptr;
+	std::string m_TextureName;
+	Texture* m_FadeTexture = nullptr;
+	glm::vec4 m_Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
+	float m_FadeDuration = 0.f;
+	float m_CurrentFade = 1.f;
+
+};
+
+}
+
+#endif

include/Engine/Input/FirstPersonInputController.h

@@ -202,7 +202,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
 
     //dashing with shift
-    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f) {
+    if (m_ShiftDashing && m_AssaultDashCoolDownTimer <= 0.0f && !isJumping) {
         //player is dashing with shift
         //the wanted-direction is set in playermovement already so we dont need to check what direction we want to dash in!
         m_AssaultDashCoolDownTimer = assaultDashCoolDownMaxTimer;
@@ -227,7 +227,7 @@ void FirstPersonInputController<EventContext>::AssaultDashCheck(double dt, bool
     }
     m_ValidDoubleTap = false;
 
-    if (!(m_AssaultDashCoolDownTimer <= 0.0f)) {
+    if (!(m_AssaultDashCoolDownTimer <= 0.0f && !isJumping)) {
         //if we cant dash at the moment, then just reset the tap-sensitivity-timer
         m_AssaultDashDoubleTapDeltaTime = 0.f;
         return;

include/Engine/Network/Client.h

@@ -24,19 +24,6 @@
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
-#include "Network/ESearchForServers.h"
-
-struct ServerInfo
-{
-    ServerInfo(std::string a, int b, std::string c, int d)
-    {
-        Address = a; Port = b; Name = c; PlayersConnected = d;
-    }
-    std::string Address = "";
-    int Port = 0;
-    std::string Name = "";
-    int PlayersConnected = 0;
-};
 
 class Client : public Network
 {
@@ -95,22 +82,18 @@ public:
     void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
-    void parseServerlist(Packet& packet);
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
     void parseEntityDeletion(Packet& packet);
-    void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
-    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
-    void displayServerlist();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -126,16 +109,10 @@ public:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
-    bool OnSearchForServers(const Events::SearchForServers& e);
+    void parsePlayerDamage(Packet& packet);
 private:
     UDPClient m_Unreliable;
-    UDPClient m_ServerlistRequest;
     TCPClient m_Reliable;
-    std::vector<ServerInfo> m_Serverlist;
-    bool m_SearchingForServers = false;
-    std::clock_t m_StartSearchTime;
-    double m_SearchingTime = 2000; // Config I guess
 };
 
 #endif

include/Engine/Network/ESearchForServers.h

@@ -1,12 +0,0 @@
-#ifndef Events_SearchForServers_h__
-#define Events_SearchForServers_h__
-
-#include "Core/Event.h"
-
-namespace Events
-{
-
-struct SearchForServers : public Event { };
-
-}
-#endif

include/Engine/Network/HybridClient.h

@@ -0,0 +1,13 @@
+#ifndef HybridClient_h__
+#define HybridClient_h__
+
+class HybridClient
+{
+public:
+    HybridClient();
+    ~HybridClient();
+private:
+
+};
+
+#endif

include/Engine/Network/HybridServer.h

@@ -0,0 +1,12 @@
+#ifndef HybridServer_h__
+#define HybridServer_h__
+
+class HybridServer
+{
+public:
+    HybridServer();
+    ~HybridServer();
+private:
+};
+
+#endif

include/Engine/Network/MessageType.h

@@ -19,7 +19,6 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
-    ServerlistRequest,
     Invalid
 };
 

include/Engine/Network/NetworkClient.h

@@ -9,16 +9,13 @@ typedef unsigned int PacketID;
 class NetworkClient
 {
 public:
-    NetworkClient();
-    virtual ~NetworkClient();
     virtual void Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;
     virtual bool IsSocketAvailable() = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/NetworkServer.h

@@ -10,15 +10,12 @@ typedef unsigned int PacketID;
 class NetworkServer
 {
 public:
-    NetworkServer();
-    virtual ~NetworkServer();
     virtual void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers) = 0;
     virtual void Receive(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet, PlayerDefinition & playerDefinition) = 0;
     virtual void Send(Packet & packet) = 0;
 protected:
-    char* m_ReadBuffer;
-    unsigned int m_BufferSize = BUFFERSIZE;
+    char m_ReadBuffer[BUFFERSIZE] = { 0 };
 };
 
 #endif

include/Engine/Network/Server.h

@@ -8,7 +8,6 @@
 
 #include "Network/TCPServer.h"
 #include "Network/UDPServer.h"
-#include "Network/UDPClient.h" //LOL
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Core/World.h"
@@ -33,7 +32,6 @@ private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
-    UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
@@ -56,7 +54,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-
+    
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -66,7 +64,6 @@ private:
     void reliableBroadcast(Packet& packet);
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
-    void addPlayersToPacket(Packet& packet, EntityID entityID);
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
     void sendPing();
@@ -80,11 +77,10 @@ private:
     void parsePlayerTransform(Packet& packet);
     void parseOnInputCommand(Packet& packet);
     void parseClientPing();
-    void parsePing();
+    void parsePing();    
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
-    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
     // Debug event

include/Engine/Network/TCPClient.h

@@ -20,7 +20,7 @@ private:
     boost::asio::ip::tcp::endpoint m_Endpoint;
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::socket> m_Socket;
-    size_t readBuffer();
+    size_t readBuffer(char* data);
     PacketID m_SendPacketID = 0;
     bool m_IsConnected = false;
 };

include/Engine/Network/TCPServer.h

@@ -16,9 +16,6 @@ public:
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet);
     void Disconnect();
-    int Port() { return m_Port; }
-    std::string Address() { return m_Address; }
-
 private:
     // TCP logic
     boost::asio::io_service m_IOService;
@@ -28,11 +25,7 @@ private:
     void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
         int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
         const boost::system::error_code& error);
-    int readBuffer(PlayerDefinition& playerDefinition);
-    int GetPort();
-    std::string GetAddress();
-    int m_Port = 0;
-    std::string m_Address = "";
+    int readBuffer(char* data, PlayerDefinition& playerDefinition);
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -14,14 +14,13 @@ public:
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);
-    void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
 private:
     // Assio UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
     PacketID m_SendPacketID = 0;
 };
 

include/Engine/Network/UDPServer.h

@@ -8,21 +8,18 @@ class UDPServer : public NetworkServer
 {
 public:
     UDPServer();
-    UDPServer(int port);
     ~UDPServer();
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet); 
-    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
-    void Broadcast(Packet & packet, int port);
+    void Send(Packet & packet);
     bool IsSocketAvailable();
 private:
     // UDP logic
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer();
+    int readBuffer(char* data);
 };
 
 #endif

include/Engine/Rendering/CubeMapPass.h

@@ -1,27 +0,0 @@
-#ifndef CubeMapPass_h__
-#define CubeMapPass_h__
-
-#include "IRenderer.h"
-#include "ShaderProgram.h"
-
-class CubeMapPass
-{
-public:
-    CubeMapPass(IRenderer* renderer);
-    ~CubeMapPass() { }
-
-    void LoadTextures(std::string input);
-    void FillCubeMap(glm::vec3 originPosition);
-    void GenerateCubeMapTexture();
-
-    //GLuint CubeMapTexture() const { return m_CubeMapTexture; }
-    GLuint m_CubeMapTexture = -1;
-
-private:
-    IRenderer* m_Renderer;
-    std::string m_PreviusCubeMapTexture;
-
-    std::vector<Texture*> m_CubeMapTextures;
-};
-
-#endif 

include/Engine/Rendering/DrawBloomPass.h

@@ -24,8 +24,6 @@ public:
 
     void Draw(GLuint texture);
 
-    void OnWindowResize();
-
     //Getters
     //Return the blurred result of the texture that was sent into draw
     GLuint GaussianTexture() const { return m_GaussianTexture_vert; }

include/Engine/Rendering/DrawFinalPass.h

@@ -4,7 +4,6 @@
 #include "IRenderer.h"
 #include "DrawFinalPassState.h"
 #include "LightCullingPass.h"
-#include "CubeMapPass.h"
 #include "FrameBuffer.h"
 #include "ShaderProgram.h"
 #include "Util/UnorderedMapVec2.h"
@@ -14,14 +13,13 @@
 class DrawFinalPass
 {
 public:
-    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass, CubeMapPass* cubeMapPass);
+    DrawFinalPass(IRenderer* renderer, LightCullingPass* lightCullingPass);
     ~DrawFinalPass() { }
     void InitializeTextures();
     void InitializeFrameBuffers();
     void InitializeShaderPrograms();
-    void Draw(RenderScene& scene, GLuint SSAOTexture);
+    void Draw(RenderScene& scene);
     void ClearBuffer();
-    void OnWindowResize();
 
     //Return the texture that is used in later stages to apply the bloom effect
     GLuint BloomTexture() const { return m_BloomTexture; }
@@ -33,12 +31,13 @@ public:
     FrameBuffer* FinalPassFrameBuffer() { return &m_FinalPassFrameBuffer; }
     FrameBuffer* FinalPassFrameBufferLowRes() { return &m_FinalPassFrameBufferLowRes; }
 
+
 private:
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
     void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps) const;
 
     void DrawSprites(std::list<std::shared_ptr<RenderJob>>&jobs, RenderScene& scene);
-    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene, GLuint SSAOTexture);
+    void DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldToStencilBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawShieldedModelRenderQueue(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
     void DrawToDepthBuffer(std::list<std::shared_ptr<RenderJob>>& jobs, RenderScene& scene);
@@ -63,14 +62,12 @@ private:
     GLuint m_SceneTextureLowRes;
     GLuint m_DepthBuffer;
     GLuint m_DepthBufferLowRes;
-    GLuint m_CubeMapTexture;
 
     //maqke this component based i guess?
     GLuint m_ShieldPixelRate = 16;
 
     const IRenderer* m_Renderer;
     const LightCullingPass* m_LightCullingPass;
-    const CubeMapPass* m_CubeMapPass;
 
     ShaderProgram* m_ForwardPlusProgram;
     ShaderProgram* m_ExplosionEffectProgram;

include/Engine/Rendering/LightCullingPass.h

@@ -21,7 +21,6 @@ public:
     void SetSSBOSizes();
     void CullLights(RenderScene& scene);
     void FillLightList(RenderScene& scene);
-    void OnWindowResize();
 
     GLuint FrustumSSBO() const { return m_FrustumSSBO; }
     GLuint LightSSBO() const { return m_LightSSBO; }

include/Engine/Rendering/ModelJob.h

@@ -108,7 +108,6 @@ struct ModelJob : RenderJob
         EndIndex = matGroup->EndIndex;
         Matrix = matrix;
         Color = modelComponent["Color"];
-        GlowIntensity = ((double)modelComponent["GlowIntensity"]);
         Entity = modelComponent.EntityID;
         glm::vec3 abspos = Transform::AbsolutePosition(world, modelComponent.EntityID);
         glm::vec3 worldpos = glm::vec3(camera->ViewMatrix() * glm::vec4(abspos, 1));
@@ -171,7 +170,7 @@ struct ModelJob : RenderJob
     ::Skeleton::AnimationOffset AnimationOffset;
     
 
-    float GlowIntensity = 8.0;
+
     glm::vec4 DiffuseColor;
     glm::vec4 SpecularColor;
     glm::vec4 IncandescenceColor;
@@ -184,7 +183,7 @@ struct ModelJob : RenderJob
 
     void CalculateHash() override
     {
-        Hash = ShaderID << 20 + ModelID << 10 + TextureID;
+        Hash = TextureID + ModelID << 10 + ShaderID << 20;
     }
 };
 

include/Engine/Rendering/PickingPass.h

@@ -22,8 +22,6 @@ public:
     void Draw(RenderScene& scene);
     void ClearPicking();
 
-    void OnWindowResize();
-
     //Getters
     const ShaderProgram& PickingProgram() const { return *m_PickingProgram; }
     //const std::unordered_map<glm::ivec2, EntityID>& PickingColorsToEntity() const { return m_PickingColorsToEntity; }
@@ -42,7 +40,7 @@ private:
     const IRenderer* m_Renderer;
 
     ShaderProgram* m_PickingProgram;
-    ShaderProgram* m_PickingSkinnedProgram;
+	ShaderProgram* m_PickingSkinnedProgram;
     Camera* m_Camera;
 
     struct PickingInfo

include/Engine/Rendering/Renderer.h

@@ -16,8 +16,6 @@
 #include "DrawScreenQuadPass.h"
 #include "DrawBloomPass.h"
 #include "DrawColorCorrectionPass.h"
-#include "SSAOPass.h"
-#include "CubeMapPass.h"
 #include "../Core/EventBroker.h"
 #include "ImGuiRenderPass.h"
 #include "Camera.h"
@@ -25,12 +23,9 @@
 #include "imgui/imgui.h"
 #include "TextPass.h"
 #include "Util/CommonFunctions.h"
-#include "Core/PerformanceTimer.h"
 
 class Renderer : public IRenderer
 {
-    static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
-
 public:
     Renderer(EventBroker* eventBroker) 
         : m_EventBroker(eventBroker)
@@ -42,12 +37,8 @@ public:
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
-
-    static std::unordered_map <GLFWwindow*, Renderer*> m_WindowToRenderer;
-
     EventBroker* m_EventBroker;
     TextPass* m_TextPass;
 
@@ -59,14 +50,6 @@ private:
     Model* m_UnitSphere;
 
     int m_DebugTextureToDraw = 0;
-    int m_CubeMapTexture = 0;
-    bool m_ResizeWindow = false;
-	float m_SSAO_Radius = 1.0f;
-	float m_SSAO_Bias = 0.05f;
-	float m_SSAO_Contrast = 1.5f;
-	float m_SSAO_IntensityScale = 1.0f;
-	int m_SSAO_NumOfSamples = 24;
-	int m_SSAO_NumOfTurns = 7;
 
     PickingPass* m_PickingPass;
     LightCullingPass* m_LightCullingPass;
@@ -75,8 +58,6 @@ private:
     DrawScreenQuadPass* m_DrawScreenQuadPass;
     DrawBloomPass* m_DrawBloomPass;
     DrawColorCorrectionPass* m_DrawColorCorrectionPass;
-	SSAOPass* m_SSAOPass;
-    CubeMapPass* m_CubeMapPass;
 
     //----------------------Functions----------------------//
     void InitializeWindow();

include/Engine/Rendering/SSAOPass.h

@@ -1,63 +0,0 @@
-#ifndef SSAOPass_h__
-#define SSAOPass_h__
-
-#include "IRenderer.h"
-#include "SSAOPassState.h"
-//#include "LightCullingPass.h" Finalpass om den skall skickas in
-#include "FrameBuffer.h"
-#include "ShaderProgram.h"
-#include "DrawBloomPass.h"
-//#include "Util/UnorderedMapVec2.h"
-#include "Texture.h"
-
-class SSAOPass
-{
-public:
-	SSAOPass(IRenderer* rendere);
-	~SSAOPass() { 
-		delete m_DrawBloomPass;
-	};
-
-	void Draw(GLuint depthBuffer, Camera* camera);
-	void Setting(float radius, float bias, float contrast, float intensityScale, int numOfSamples, int NumOfTurns);
-	void ClearBuffer();
-	void OnWindowResize();
-
-	//Return the SSAO of the texture sent to Draw
-	GLuint SSAOTexture() const { return m_DrawBloomPass->GaussianTexture(); }
-
-private:
-	void InitializeTexture();
-	void InitializeFrameBuffer();
-	void InitializeShaderProgram();
-	void InitializeBuffer();
-
-	void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const;
-
-	//void blurHorizontal(GLuint depthBuffer);
-	//void blurVertical(GLuint depthBuffer);
-
-	Model* m_ScreenQuad;
-
-	const IRenderer* m_Renderer;
-
-	float m_Radius;
-	float m_Bias;
-	float m_Contrast;
-	float m_IntensityScale;
-	int m_NumOfSamples;
-	int m_NumOfTurns;
-
-	GLuint m_SSAOTexture;
-	FrameBuffer m_SSAOFramBuffer;
-
-	GLuint m_SSAOViewSpaceZTexture;
-	FrameBuffer m_SSAOViewSpaceZFramBuffer;
-
-	ShaderProgram* m_SSAOProgram;
-	ShaderProgram* m_SSAOViewSpaceZProgram;
-
-	DrawBloomPass* m_DrawBloomPass;
-};
-
-#endif

include/Engine/Rendering/SSAOPassState.h

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

include/Engine/Rendering/SpriteJob.h

@@ -17,7 +17,7 @@
 
 struct SpriteJob : RenderJob
 {
-    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted, bool isIndicator)
+    SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
         : RenderJob()
     {
         Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
@@ -30,7 +30,7 @@ struct SpriteJob : RenderJob
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;
-		Matrix = matrix;
+        Matrix = matrix;
         Color = cSprite["Color"];
         Entity = cSprite.EntityID;
         Position = Transform::AbsolutePosition(world, cSprite.EntityID);
@@ -40,8 +40,6 @@ struct SpriteJob : RenderJob
             Depth = viewpos.z;
         }
         World = world;
-        Pickable = world->HasComponent(cSprite.EntityID, "Button");
-		IsIndicator = isIndicator;
 
         FillColor = fillColor;
         FillPercentage = fillPercentage;
@@ -63,9 +61,6 @@ struct SpriteJob : RenderJob
     unsigned int EndIndex = 0;
     World* World;
 
-    bool Pickable;
-	bool IsIndicator = false;
-
     glm::vec4 FillColor = glm::vec4(0);
     float FillPercentage = 0.0;
 

include/Engine/Rendering/Texture.h

@@ -18,7 +18,6 @@ public:
 	void Bind(GLenum textureUnit = GL_TEXTURE0);
 
 	GLuint m_Texture = 0;
-    unsigned char* Data = nullptr;
     
 };
 

include/Game/Game.h

@@ -8,6 +8,7 @@
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
+#include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
@@ -34,9 +35,6 @@
 #include "Sound/SoundManager.h"
 #include "Systems/SoundSystem.h"
 
-//Performance 
-#include "Core/PerformanceTimer.h"
-
 class Game
 {
 public:
@@ -55,6 +53,7 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
     InputProxy* m_InputProxy;
+	GUI::Frame* m_FrameStack;
     World* m_World;
     Octree<EntityAABB>* m_OctreeCollision;
     Octree<EntityAABB>* m_OctreeTrigger;

include/Game/MiniDump.h

@@ -1,8 +0,0 @@
-#ifndef MiniDump_h__
-#define MiniDump_h__
-
-#include <Windows.h>
-
-void WINAPI Create_Dump(PEXCEPTION_POINTERS pException, BOOL File_Flag, BOOL Show_Flag);
-
-#endif

include/Game/Systems/AmmoPickupSystem.h

@@ -26,7 +26,6 @@ private:
         double AmmoGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewAmmoPickup> m_ETriggerTouchVector;
 };

include/Game/Systems/DamageIndicatorSystem.h

@@ -14,13 +14,11 @@
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Rendering/Util/CommonFunctions.h"
-//#define INDICATOR_TEST
 
-class DamageIndicatorSystem : public ImpureSystem
+class DamageIndicatorSystem : public System
 {
 public:
     DamageIndicatorSystem(SystemParams params);
-    virtual void Update(double dt) override;
 
 private:
     EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
@@ -30,20 +28,6 @@ private:
     bool OnSetCamera(const Events::SetCamera& e);
 
     EntityID m_CurrentCamera = -1;
-    struct DamageIndicatorStruct {
-        EntityWrapper spriteEntity;
-        glm::vec3 enemyPosition;
-        DamageIndicatorStruct(EntityWrapper sprite, glm::vec3 pos)
-            : spriteEntity(sprite)
-            , enemyPosition(pos) {}
-    };
-    std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
-    float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
-    //for tests
-#ifdef INDICATOR_TEST
-    glm::vec3 DamageIndicatorTest(EntityWrapper player);
-    int m_TestVar = 0;
-#endif
 };
 #endif

include/Game/Systems/HealthSystem.h

@@ -9,8 +9,7 @@
 #include "Core/EPlayerDamage.h"
 #include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
-#include "Core/ConfigFile.h"
-#include "Input/EInputCommand.h"
+#include "../Engine/Input/EInputCommand.h"
 
 #include <tuple>
 #include <vector>
@@ -25,18 +24,17 @@ public:
     virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;
 
 private:
-    bool m_NetworkEnabled;
-
-   // methods which will take care of specific events
+    //methods which will take care of specific events
     EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
     bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
     EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
     bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);
     EventRelay<HealthSystem, Events::InputCommand> m_InputCommand;
     bool HealthSystem::OnInputCommand(Events::InputCommand& e);
-
+    
     //vector which will keep track of health changes
     std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;
+   
 };
 
 #endif

include/Game/Systems/KillFeedSystem.h

@@ -1,39 +0,0 @@
-#ifndef KillFeedSystem_h__
-#define KillFeedSystem_h__
-
-#include "../../Engine/Core/System.h"
-#include "../../Engine/GLM.h"
-#include "Core/EPlayerDeath.h"
-
-class KillFeedSystem : public ImpureSystem
-{
-public:
-    KillFeedSystem(SystemParams params)
-        : System(params)
-    {
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &KillFeedSystem::OnPlayerDeath);
-
-    }
-
-    virtual void Update(double dt) override;
-
-private:
-
-
-
-
-    EventRelay<KillFeedSystem, Events::PlayerDeath> m_EPlayerDeath;
-    bool KillFeedSystem::OnPlayerDeath(Events::PlayerDeath& e);
-
-    struct KillFeedInfo
-    {
-        std::string Content;
-        glm::vec4 Color;
-        float TimeToLive = 5.f;
-    };
-
-    std::list<KillFeedInfo> m_DeathQueue;
-
-};
-
-#endif

include/Game/Systems/PickupSpawnSystem.h

@@ -27,7 +27,6 @@ private:
         double HealthGain;
         double RespawnTimer;
         double DecreaseThisRespawnTimer;
-        EntityID parentID;
     };
     std::vector<NewHealthPickup> m_ETriggerTouchVector;
 };

include/Game/Systems/PlayerMovementSystem.h

@@ -39,5 +39,5 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
     void updateMovementControllers(double dt);
-    void updateVelocity(EntityWrapper player, double dt);
+    void updateVelocity(double dt);
 };

include/Game/Systems/SpawnerSystem.h

@@ -15,16 +15,11 @@ class SpawnerSystem : public System
 public:
     SpawnerSystem(SystemParams params);
 
-    // If dontCollideComponent is set, to e.g. "Player", then all the spawner 
-    // will try to pick a spawn location so that the spawned entity doesn't 
-    // collide with anything that has that component and is collidable.
-    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
+    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid);
 
 private:
     EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
     bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
-    static void transformEntityToSpawnPoint(EntityWrapper spawnedEntity, EntityWrapper spawnPoint);
-    static bool spawnedEntityIsColliding(EntityWrapper spawnedEntity, EntityWrapper spawnPoint, const std::string& dontCollideComponent);
 };
 
 #endif

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,8 +1,6 @@
-#ifndef AssaultWeaponBehaviour_h__
-#define AssaultWeaponBehaviour_h__
-
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
+#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
@@ -23,20 +21,22 @@ public:
 private:
     EntityWrapper m_FirstPersonModel;
     EntityWrapper m_ThirdPersonModel;
-
     // State
     bool m_Firing = false;
     bool m_Reloading = false;
     double m_ReloadTimer = 0.0;
+    EntityWrapper m_FirstPersonReloadImpersonator;
+    EntityWrapper m_ThirdPersonReloadImpersonator;
     double m_TimeSinceLastFire = 0.0;
-    EntityWrapper m_FirstPersonReloadImpostor;
+
+    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
+    bool OnAnimationComplete(Events::AnimationComplete& e);
 
     bool hasAmmo();
     void fireRound();
     void spawnTracer();
     float traceRayDistance(glm::vec3 origin, glm::vec3 direction);
-    void playFireSound();
-    void playEmptySound();
+    void playSound();
     void viewPunch();
     void finishReload();
     void playShootAnimation();
@@ -45,5 +45,3 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
-
-#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -1,16 +0,0 @@
-#include "WeaponBehaviour.h"
-
-class DefenderWeaponBehaviour : public WeaponBehaviour
-{
-public:
-    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
-
-    virtual void Fire() override;
-    //virtual void CeaseFire() override;
-    //virtual void Reload() override;
-
-    //virtual void Update(double dt) override;
-
-private:
-    double m_TimeSinceLastFire = 0.0;
-};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -8,21 +8,17 @@
 
 class WeaponBehaviour : public System
 {
-    friend class WeaponSystem;
-
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player, EntityWrapper firstPersonWeapon, EntityWrapper thirdPersonWeapon)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
         : System(systemParams)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
         , m_Player(player)
-        , m_FirstPerson(firstPersonWeapon)
-        , m_ThirdPerson(thirdPersonWeapon)
     { }
     virtual ~WeaponBehaviour() = default;
 
     WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour&) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
 
     virtual void Fire() = 0;
     virtual void CeaseFire() { }
@@ -33,8 +29,6 @@ protected:
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
     EntityWrapper m_Player;
-    EntityWrapper m_FirstPerson;
-    EntityWrapper m_ThirdPerson;
 };
 
 #endif

resources/DefaultInput.ini

@@ -25,6 +25,4 @@ C=ConnectToServer
 N=SwitchToServer
 M=SwitchToClient
 P=SwitchToPlayer
-K=TakeDamage,1500
-F2=PerformanceTimingResetAllTimers
-F3=PerformanceTimingCreateExcelData
+K=TakeDamage,1500

resources/Schema/Components.xsd

@@ -41,10 +41,4 @@
 	<xs:include schemaLocation="Components/Shielded.xsd"/>
 	<xs:include schemaLocation="Components/CapturePointHUD.xsd"/>
 	<xs:include schemaLocation="Components/AmmunitionHUD.xsd"/>
-	<xs:include schemaLocation="Components/Menu.xsd"/>
-	<xs:include schemaLocation="Components/KillFeed.xsd"/>
-	<xs:include schemaLocation="Components/Page.xsd"/>
-	<xs:include schemaLocation="Components/SpriteIndicator.xsd"/>
-	<xs:include schemaLocation="Components/Button.xsd"/>
-	<xs:include schemaLocation="Components/WeaponAttachment.xsd"/>
 </xs:schema>

resources/Schema/Components/Button.xml

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

resources/Schema/Components/Button.xsd

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

resources/Schema/Components/KillFeed.xml

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

resources/Schema/Components/KillFeed.xsd

@@ -1,9 +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="KillFeed">
-		<xs:annotation>
-			<xs:documentation>HUD element for tracking the 3 last kills, printed on the children with the names "KillFeed1", "KillFeed2", "KillFeed3"</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Menu.xml

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

resources/Schema/Components/Menu.xsd

@@ -1,9 +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="Menu">
-		<xs:annotation>
-			<xs:documentation>Attach this to the center point of a menu that uses several pages.</xs:documentation>
-		</xs:annotation>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Model.xml

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

resources/Schema/Components/Model.xsd

@@ -33,9 +33,6 @@
 				<xs:element name="GlowMap" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>Whether the model should use the Glowmap or not</xs:documentation></xs:annotation>
 				</xs:element>
-				<xs:element name="GlowIntensity" type="t:double" minOccurs="0">
-					<xs:annotation><xs:documentation>Intensity of the glow map</xs:documentation></xs:annotation>
-				</xs:element>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Components/Page.xml

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

resources/Schema/Components/Page.xsd

@@ -1,14 +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="Page">
-		<xs:annotation>
-			<xs:documentation>Use this on a child to a Menu entity and make sure that ID is not the same as other pages.</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="ID" type="t:int" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Physics.xml

@@ -2,7 +2,6 @@
 <Physics xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Physics.xsd">
 	<Velocity X="0" Y="0" Z="0"/>
 	<Gravity>true</Gravity>
-	<PrevOrigin X="-9876.5" Y="-9876.5" Z="-9876.5"/>
 	<IsOnGround>false</IsOnGround>
 	<VerticalStepHeight>0.33</VerticalStepHeight>
 </Physics>

resources/Schema/Components/Physics.xsd

@@ -13,7 +13,6 @@
 					<xs:annotation><xs:documentation>m/s^2</xs:documentation></xs:annotation>
 				</xs:element>
 				<xs:element name="Gravity" type="t:bool" minOccurs="0"/>
-				<xs:element name="PrevOrigin" type="t:Vector" minOccurs="0"/>
 				<xs:element name="IsOnGround" type="t:bool" minOccurs="0"/>
 				<xs:element name="VerticalStepHeight" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>The largest height of a "stair-step" that can be walked over</xs:documentation></xs:annotation>

resources/Schema/Components/SpriteIndicator.xml

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

resources/Schema/Components/SpriteIndicator.xsd

@@ -1,19 +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="SpriteIndicator">
-		<xs:annotation>
-			<xs:documentation>Billbord a Sprite around global Y axis</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="MinScale" type="t:double" minOccurs="0"/>
-				<xs:element name="VisibleForSingleTeamOnly" type="t:bool" minOccurs="0">
-					<xs:annotation><xs:documentation>Add a Team component to this Entity or Parent to make it visible only for that team</xs:documentation></xs:annotation>
-				</xs:element>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Components/Text.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Text xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Text.xsd">
-	<Content></Content>
+	<Content>Text</Content>
 	<Resource></Resource>
 	<Color R="1" G="1" B="1" A="1"/>
 	<Visible>true</Visible>

resources/Schema/Components/Weapon.xml

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

resources/Schema/Components/Weapon.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="Weapon">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="MagSize" type="t:int" minOccurs="0"/>
+				<xs:element name="MaxAmmo" type="t:int" minOccurs="0"/>
+				<xs:element name="CurrentAmmoInMag" type="t:int" minOccurs="0"/>
+				<xs:element name="CurrentAmmo" type="t:int" minOccurs="0"/>
+				<xs:element name="RPM" type="t:double" minOccurs="0"/>
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

resources/Schema/Components/WeaponAttachment.xml

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

resources/Schema/Components/WeaponAttachment.xsd

@@ -1,37 +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:complexType name="PersonEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="FirstPerson" type="t:int" fixed="0" minOccurs="0"/>
-					<xs:element name="ThirdPerson" type="t:int" fixed="1" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:complexType name="WeaponSlotEnum" mixed="true">
-		<xs:complexContent>
-			<xs:extension base="t:enum">
-				<xs:choice>
-					<xs:element name="Primary" type="t:int" fixed="1" minOccurs="0"/>
-					<xs:element name="Secondary" type="t:int" fixed="2" minOccurs="0"/>
-				</xs:choice>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-
-	<xs:element name="WeaponAttachment">
-		<xs:annotation><xs:documentation>Combine with a spawner to define a weapon attachment point</xs:documentation></xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Person" type="PersonEnum" minOccurs="0"/>
-				<xs:element name="Slot" type="WeaponSlotEnum" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

resources/Schema/Entities/AmmoPickup.xml

@@ -2,18 +2,13 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:AABB/>
     <c:AmmoPickup/>
     <c:Model>
-      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+      <Resource>Models/Core/UnitSphere.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="18717.9453" Z="0"/>
+      <Position X="0" Y="1" Z="0"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/Button.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="Button" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Button/>
-    <c:Sprite>
-      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-    </c:Sprite>
-    <c:Transform>
-      <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Text">
-      <Components>
-        <c:Text>
-          <Content>Play</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-          <Color A="1" B="1" G="0.847058833" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Entities/DeadGirl.xlm

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

resources/Schema/Entities/GameMap.xml

@@ -144,7 +144,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="57.7363472" Y="4.98900032" Z="79.5"/>
+          <Position X="57.7363472" Y="2.38900018" Z="79.5"/>
         </c:Transform>
       </Components>
       <Children>
@@ -206,16 +206,14 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.2567062" Y="9.40000057" Z="-78.1000061"/>
+          <Position X="-60.2567062" Y="3.4000001" Z="-78.1000061"/>
         </c:Transform>
       </Components>
       <Children>
         <Entity>
           <Components>
             <c:SpawnPoint/>
-            <c:Transform>
-              <Position X="0" Y="2.10000014" Z="0"/>
-            </c:Transform>
+            <c:Transform/>
           </Components>
           <Children/>
         </Entity>

resources/Schema/Entities/HealthPickup.xml

@@ -2,18 +2,13 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:AABB/>
     <c:HealthPickup/>
     <c:Model>
-      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
+      <Resource>Models/Core/UnitSphere.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="18767.0273" Z="0"/>
+      <Position X="0" Y="1" Z="0"/>
     </c:Transform>
     <c:Trigger/>
   </Components>

resources/Schema/Entities/NewMap.xml

@@ -89,7 +89,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Highground5.mesh</Resource>
-                  <Color A="1" B="7.84313726" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform/>
               </Components>
@@ -100,7 +99,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Highground6.mesh</Resource>
-                  <Color A="1" B="7.84313726" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform/>
               </Components>
@@ -370,7 +368,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
+                  <Resource>Models/Props/Pillars/SciFiPillar2.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="55.0098839" Y="0" Z="80.7891693"/>
@@ -383,7 +381,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Pillars/SciFiPillar2Red.mesh</Resource>
+                  <Resource>Models/Props/Pillars/SciFiPillar2.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-57.6669235" Y="-0.0117412386" Z="-84.8278427"/>
@@ -593,7 +591,7 @@
                   <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="57.2414131" Y="-0.458255291" Z="53.1675453"/>
+                  <Position X="56.3723755" Y="-0.458255291" Z="53.1675453"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -726,7 +724,7 @@
                       <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="-3.20842171" Y="0" Z="0.0110195652"/>
+                      <Position X="-2.87285304" Y="0" Z="0.0110195652"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                     </c:Transform>
                   </Components>
@@ -739,7 +737,7 @@
                       <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.16696811" Y="0" Z="-0.00627081469"/>
+                      <Position X="2.9002583" Y="0" Z="-0.00627081469"/>
                       <Scale X="1" Y="0.800000012" Z="1"/>
                     </c:Transform>
                   </Components>
@@ -1291,7 +1289,7 @@
                   <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="42.6762505" Y="-0.436794043" Z="53.3168259"/>
+                  <Position X="42.3930092" Y="-0.436794043" Z="53.3168259"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1302,7 +1300,7 @@
                       <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="3.02606034" Y="0" Z="0"/>
+                      <Position X="2.79896975" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1314,7 +1312,7 @@
                       <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="6.20324564" Y="0" Z="0"/>
+                      <Position X="5.67178059" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1326,7 +1324,7 @@
                       <Resource>Models/Props/Walls/BigWallBlue.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="9.40820885" Y="0" Z="0"/>
+                      <Position X="8.55263519" Y="0" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children/>
@@ -1517,7 +1515,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Flora/SpecialRoot.mesh</Resource>
-                  <Color A="1" B="1" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform>
                   <Position X="-37.5227966" Y="-0.41070056" Z="38.790432"/>
@@ -1888,7 +1885,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Red.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="45.3988762" Y="6.10456753" Z="-73.9011993"/>
@@ -2007,7 +2004,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Blue.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-41.0066338" Y="6.08244133" Z="75.8575821"/>
@@ -2141,7 +2138,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Blue.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-47.6850471" Y="7.0585866" Z="38.1646194"/>
@@ -2154,7 +2151,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Blue.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="-25.9571095" Y="6.43997049" Z="41.7452164"/>
@@ -2181,7 +2178,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Red.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="46.3167992" Y="6.36057663" Z="-37.5957794"/>
@@ -2194,7 +2191,7 @@
               <Components>
                 <c:Collidable/>
                 <c:Model>
-                  <Resource>Models/Props/Bridges/SciFiBridge1Red.mesh</Resource>
+                  <Resource>Models/Props/Bridges/SciFiBridge.mesh</Resource>
                 </c:Model>
                 <c:Transform>
                   <Position X="25.2147388" Y="6.4451251" Z="-41.7257042"/>
@@ -2733,7 +2730,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Flora/SpecialRoot.mesh</Resource>
-                  <Color A="1" B="1" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform>
                   <Position X="36.8391495" Y="0.354240507" Z="-36.1228752"/>
@@ -2952,7 +2948,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Flora/SpecialRoot.mesh</Resource>
-                  <Color A="1" B="1" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform>
                   <Position X="-15.8430891" Y="2.84977508" Z="55.3108711"/>
@@ -3066,7 +3061,6 @@
                 <c:Collidable/>
                 <c:Model>
                   <Resource>Models/Props/Flora/SpecialRoot.mesh</Resource>
-                  <Color A="1" B="1" G="7.84313726" R="7.84313726"/>
                 </c:Model>
                 <c:Transform>
                   <Position X="16.3593407" Y="4.03186893" Z="-54.4961166"/>
@@ -3310,60 +3304,6 @@
                   </Components>
                   <Children/>
                 </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/BigStone.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="2.85156512" Y="-1.23010564" Z="-1.48294902"/>
-                      <Scale X="1.50000012" Y="1" Z="1.4000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/MediumStone2.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="-8.1107378" Y="1.61279738" Z="6.04347277"/>
-                      <Scale X="2.70000005" Y="2.20000005" Z="2.4000001"/>
-                      <Orientation X="1.02200007" Y="1.27200007" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/BigStone.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="-12.3116245" Y="3.30153632" Z="2.33947349"/>
-                      <Orientation X="0" Y="3.46600008" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity>
-                      <Components>
-                        <c:Collidable/>
-                        <c:Model>
-                          <Resource>Models/Props/Stones/BigStone.mesh</Resource>
-                        </c:Model>
-                        <c:Transform>
-                          <Position X="2.7208035" Y="0.631672204" Z="1.97706997"/>
-                          <Orientation X="0" Y="0" Z="5.86300039"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
               </Children>
             </Entity>
             <Entity>
@@ -3373,7 +3313,7 @@
                   <Resource>Models/Props/Stones/BigStone.mesh</Resource>
                 </c:Model>
                 <c:Transform>
-                  <Position X="-32.141304" Y="1.78250229" Z="-52.9675865"/>
+                  <Position X="-32.077774" Y="1.78250229" Z="-52.9675865"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -3403,46 +3343,6 @@
                   </Components>
                   <Children/>
                 </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/BigStone.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="13.3016024" Y="-1.04082656" Z="-2.06582665"/>
-                      <Orientation X="0" Y="1.17200005" Z="6.28300047"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/SmallStone1.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="7.52924776" Y="0.407071143" Z="-2.09290624"/>
-                      <Scale X="3.4000001" Y="5.70000029" Z="3.70000029"/>
-                      <Orientation X="0" Y="1.7700001" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity>
-                  <Components>
-                    <c:Collidable/>
-                    <c:Model>
-                      <Resource>Models/Props/Stones/BigStone.mesh</Resource>
-                    </c:Model>
-                    <c:Transform>
-                      <Position X="-5.73053885" Y="-0.909733951" Z="4.32710028"/>
-                      <Orientation X="0" Y="3.46600008" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
               </Children>
             </Entity>
             <Entity>
@@ -3792,7 +3692,7 @@
                       <Resource>Models/Props/Stones/SmallStone1.mesh</Resource>
                     </c:Model>
                     <c:Transform>
-                      <Position X="17.9978104" Y="0.729522109" Z="65.3742523"/>
+                      <Position X="17.9978104" Y="0.729522109" Z="64.9478226"/>
                       <Scale X="3" Y="3" Z="3"/>
                       <Orientation X="2.68900013" Y="3.5940001" Z="0"/>
                     </c:Transform>
@@ -4042,7 +3942,7 @@
                 </c:Model>
                 <c:Transform>
                   <Position X="-40.5458374" Y="-0.729142785" Z="-45.7907982"/>
-                  <Orientation X="4.93700027" Y="4.81200027" Z="1.37700009"/>
+                  <Orientation X="4.93700027" Y="3.5" Z="1.37700009"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -4158,7 +4058,21 @@
                   <Orientation X="0" Y="1.93500006" Z="0"/>
                 </c:Transform>
               </Components>
-              <Children/>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Collidable/>
+                    <c:Model>
+                      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
+                    </c:Model>
+                    <c:Transform>
+                      <Position X="0" Y="2.53721571" Z="0"/>
+                      <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
             </Entity>
             <Entity>
               <Components>
@@ -4765,7 +4679,6 @@
                   <HomePointForTeam>
                     <Blue/>
                   </HomePointForTeam>
-                  <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCylinder.mesh</Resource>
@@ -4801,7 +4714,7 @@
             <Entity>
               <Components>
                 <c:CapturePoint>
-                  <CapturePointNumber>3</CapturePointNumber>
+                  <CapturePointNumber>1</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCylinder.mesh</Resource>
@@ -4866,7 +4779,7 @@
               <Components>
                 <c:CapturePoint>
                   <CaptureTimer>1.5498908015879351</CaptureTimer>
-                  <CapturePointNumber>1</CapturePointNumber>
+                  <CapturePointNumber>3</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCylinder.mesh</Resource>
@@ -4901,6 +4814,7 @@
                   <HomePointForTeam>
                     <Red/>
                   </HomePointForTeam>
+                  <CapturePointNumber>4</CapturePointNumber>
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCylinder.mesh</Resource>
@@ -5019,7 +4933,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="-60.3695679" Y="5.64500046" Z="-79.3789597"/>
+          <Position X="0" Y="6.69097853" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5028,10 +4942,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="9.3347702" Y="2.70210314" Z="2.33294678"/>
+              <Position X="1" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5041,10 +4954,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="5.59104443" Y="2.14147282" Z="6.07936668"/>
+              <Position X="-1" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5054,10 +4966,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="-2.2788806" Y="0" Z="3.17202592"/>
+              <Position X="0" Y="0" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5067,10 +4978,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="1.14053249" Y="0" Z="-1.67306876"/>
+              <Position X="0" Y="0" Z="-1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5089,7 +4999,7 @@
           </Team>
         </c:Team>
         <c:Transform>
-          <Position X="60.0169258" Y="5.78000021" Z="76.2893906"/>
+          <Position X="-4.2177043" Y="5.59916019" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -5098,10 +5008,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="2.02889442" Y="0.194165871" Z="-1.17950201"/>
+              <Position X="1" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5111,10 +5020,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="-9.04242706" Y="1.82531989" Z="-0.421615779"/>
+              <Position X="-1" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5124,10 +5032,9 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="1.64179754" Y="0.634559035" Z="4.27690458"/>
+              <Position X="0" Y="0" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -5137,175 +5044,15 @@
             <c:SpawnPoint/>
             <c:Model>
               <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
-              <Visible>false</Visible>
             </c:Model>
             <c:Transform>
-              <Position X="-6.58577824" Y="1.97348273" Z="-2.86768818"/>
+              <Position X="0" Y="0" Z="-1"/>
             </c:Transform>
           </Components>
           <Children/>
         </Entity>
       </Children>
     </Entity>
-    <Entity name="HealthPickups">
-      <Components>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity>
-          <Components>
-            <c:HealthPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="48.9189453" Y="7.06223536" Z="-78.9347992"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="75.6124268" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:AmmoPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="-59.3499641" Y="7.46932745" Z="-20.6276321"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="72.2667694" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:HealthPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="-1.13644195" Y="1.38919806" Z="38.9768829"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.8748016" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:HealthPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="54.7225227" Y="6.51863909" Z="29.0052128"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="70.1887283" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:AmmoPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="-51.6792374" Y="8.44526482" Z="32.5153465"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="69.6374512" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:HealthPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="-42.3974304" Y="7.28327894" Z="81.9305344"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="67.7666702" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:AmmoPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="-9.85184956" Y="8.25567532" Z="39.6119232"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="66.8154602" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity>
-          <Components>
-            <c:AmmoPickup/>
-            <c:Model>
-              <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
-            </c:Model>
-            <c:RaptorCopter>
-              <Speed>0.10000000149011612</Speed>
-              <Axis X="0" Y="1" Z="0"/>
-            </c:RaptorCopter>
-            <c:Transform>
-              <Position X="49.2257118" Y="7.39368248" Z="-31.1810112"/>
-              <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-              <Orientation X="0" Y="64.0265808" Z="0"/>
-            </c:Transform>
-            <c:Trigger/>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/Player.xml

@@ -13,7 +13,6 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -36,6 +35,20 @@
         </c:Transform>
       </Components>
       <Children>
+        <Entity name="PlayerName">
+          <Components>
+            <c:Text>
+              <Resource>Fonts/DroidSans.ttf,100</Resource>
+              <Color A="1" B="0" G="1" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+              <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+              <Orientation X="0" Y="3.14199996" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="CameraModel">
           <Components>
             <c:Model>
@@ -61,7 +74,6 @@
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
-                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -94,7 +106,7 @@
                     <c:Text>
                       <Content>100/100</Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+                      <Color A="0.392156869" B="1" G="0" R="0"/>
                     </c:Text>
                     <c:Transform>
                       <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
@@ -108,11 +120,10 @@
                   <Components>
                     <c:Fill>
                       <Percentage>1</Percentage>
-                      <Color A="0.301960796" B="1" G="0" R="0"/>
+                      <Color A="0.196078435" B="1" G="0" R="0"/>
                     </c:Fill>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
                     <c:HealthHUD/>
@@ -138,7 +149,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -156,7 +166,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -172,7 +181,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -191,7 +199,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -207,7 +214,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
                     </c:Sprite>
                     <c:Transform>
@@ -225,7 +231,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -241,7 +246,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.300000012" B="1" G="1" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -259,7 +263,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -275,7 +278,6 @@
                   <Components>
                     <c:Sprite>
                       <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
                       <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                     </c:Sprite>
                     <c:Transform>
@@ -291,7 +293,6 @@
                         </c:Fill>
                         <c:Sprite>
                           <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
@@ -304,59 +305,6 @@
                   </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>
           </Children>
         </Entity>
@@ -364,14 +312,12 @@
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>0.97725610639912475</Time1>
+              <Time1>0.1719161089749548</Time1>
               <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-              <Color A="1" B="1" G="0.309803933" R="0"/>
+              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -383,10 +329,11 @@
                 </c:BoneAttachment>
                 <c:Model>
                   <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.12043038" Y="-0.244988307" Z="-0.181454808"/>
-                  <Orientation X="0.010404544" Y="-0.00268173823" Z="0.0428441577"/>
+                  <Position X="0.120430604" Y="-0.229735136" Z="-0.181454614"/>
+                  <Orientation X="0.0104046864" Y="-0.00268157595" Z="0.0428441279"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -423,7 +370,6 @@
                       <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>
@@ -493,10 +439,8 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.87583812735846323</Time1>
+          <Time1>1.8038469763698401</Time1>
           <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -506,6 +450,7 @@
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
           <Color A="1" B="1" G="0.309803933" R="0"/>
+          <Visible>false</Visible>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -519,8 +464,8 @@
               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.163429111" Y="1.0235405" Z="-0.215489209"/>
-              <Orientation X="-0.0631071255" Y="-0.0576644838" Z="0.118255548"/>
+              <Position X="0.158596605" Y="1.02875519" Z="-0.215406924"/>
+              <Orientation X="-0.0626692027" Y="-0.0361935981" Z="0.120094992"/>
             </c:Transform>
           </Components>
           <Children>
@@ -575,41 +520,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Indicator">
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
-          <GlowMap></GlowMap>
-          <Color A="1" B="1" G="0.309803933" R="0"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84019077" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/PlayerRed.xml

@@ -13,7 +13,6 @@
     <c:DashAbility/>
     <c:Health/>
     <c:Physics>
-      <PrevOrigin X="0" Y="0.772000015" Z="0"/>
       <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
     </c:Physics>
     <c:Player>
@@ -24,7 +23,9 @@
         <Red/>
       </Team>
     </c:Team>
-    <c:Transform/>
+    <c:Transform>
+      <Position X="5519.44287" Y="0.0288832653" Z="2.64837074"/>
+    </c:Transform>
   </Components>
 
   <Children>
@@ -36,6 +37,20 @@
         </c:Transform>
       </Components>
       <Children>
+        <Entity name="PlayerName">
+          <Components>
+            <c:Text>
+              <Resource>Fonts/DroidSans.ttf,100</Resource>
+              <Color A="1" B="0" G="1" R="0"/>
+            </c:Text>
+            <c:Transform>
+              <Position X="0.100000001" Y="0.248000011" Z="-0.248000011"/>
+              <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
+              <Orientation X="0" Y="3.14199996" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
         <Entity name="CameraModel">
           <Components>
             <c:Model>
@@ -56,12 +71,30 @@
             </c:Transform>
           </Components>
           <Children>
+            <Entity name="HealthBar">
+              <Components>
+                <c:Fill>
+                  <Percentage>1</Percentage>
+                  <Color A="0" B="1" G="0" R="0"/>
+                </c:Fill>
+                <c:HealthHUD/>
+                <c:Model>
+                  <Resource>Models/Core/UnitHexagon.mesh</Resource>
+                  <Color A="1" B="0.70588237" G="0.70588237" R="0.70588237"/>
+                </c:Model>
+                <c:Transform>
+                  <Position X="-0.383000016" Y="-0.185000002" Z="0"/>
+                  <Scale X="0.150000006" Y="0.150000006" Z="0.150000006"/>
+                  <Orientation X="0" Y="0.594000041" Z="0"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
             <Entity name="Crosshair">
               <Components>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
                   <DepthSort>false</DepthSort>
-                  <GlowMap></GlowMap>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -79,300 +112,18 @@
               </Components>
               <Children/>
             </Entity>
-            <Entity name="HealthHUD">
-              <Components>
-                <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:HealthHUD/>
-                    <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:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                    </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:Sprite>
-                      <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.588235319" B="0" G="0" R="0"/>
-                    </c:Sprite>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
-                      <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="CapturePointHUD">
-              <Components>
-                <c:Transform>
-                  <Position X="0" Y="0.190541431" Z="0"/>
-                  <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>2</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0.811270177" Y="0.440691769" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>3</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Percentage>0.80222018197612788</Percentage>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="1.62788737" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>4</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.300000012" B="1" G="1" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-0.820431828" Y="0.441878349" Z="-0.100000001"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD>
-                          <CapturePointNumber>1</CapturePointNumber>
-                        </c:CapturePointHUD>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="BackgroundHexagon">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                      <GlowMap></GlowMap>
-                      <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="-1.58304751" Y="0.919596612" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="ProgressionHexagon">
-                      <Components>
-                        <c:CapturePointHUD/>
-                        <c:Fill>
-                          <Color A="0.699999988" B="1" G="0.200000003" R="0"/>
-                        </c:Fill>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
-                          <GlowMap></GlowMap>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
-                          <Orientation X="0" Y="0" Z="1.57079637"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </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>
           </Children>
         </Entity>
         <Entity name="Hands">
           <Components>
             <c:Animation>
               <AnimationName1>Idle</AnimationName1>
-              <Time1>1.2667383999985162</Time1>
+              <Time1>0.1719161089749548</Time1>
               <Speed1>1</Speed1>
-              <AnimationName2></AnimationName2>
-              <AnimationName3></AnimationName3>
             </c:Animation>
             <c:Model>
               <Resource>Models/Characters/Assault/FirstPerson.mesh</Resource>
-              <Color A="1" B="0" G="0" R="1"/>
+              <Transparent>true</Transparent>
             </c:Model>
             <c:Transform/>
           </Components>
@@ -384,10 +135,11 @@
                 </c:BoneAttachment>
                 <c:Model>
                   <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
+                  <Transparent>true</Transparent>
                 </c:Model>
                 <c:Transform>
-                  <Position X="0.120430425" Y="-0.242105931" Z="-0.181454822"/>
-                  <Orientation X="0.010404665" Y="-0.00268179877" Z="0.0428443067"/>
+                  <Position X="0.1204307" Y="-0.228431284" Z="-0.181454539"/>
+                  <Orientation X="0.0104045458" Y="-0.00268182717" Z="0.0428440496"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -405,71 +157,12 @@
                 <Entity name="FirstPersonReloadSpawner">
                   <Components>
                     <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectViewRed.xml</EntityFile>
+                      <EntityFile>Schema/Entities/ReloadEffectView.xml</EntityFile>
                     </c:Spawner>
                     <c:Transform/>
                   </Components>
                   <Children/>
                 </Entity>
-                <Entity name="AmmunitionHUD">
-                  <Components>
-                    <c:AmmunitionHUD/>
-                    <c:Transform>
-                      <Position X="-0.0430000015" Y="0.131501317" Z="-0.0670000017"/>
-                      <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="AmmunitionHUDBackground">
-                      <Components>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-                          <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>
           </Children>
@@ -494,10 +187,8 @@
       <Components>
         <c:Animation>
           <AnimationName1>Idle</AnimationName1>
-          <Time1>0.26532318661337229</Time1>
+          <Time1>1.8038469763698401</Time1>
           <Speed1>1</Speed1>
-          <AnimationName2></AnimationName2>
-          <AnimationName3></AnimationName3>
         </c:Animation>
         <c:AnimationOffset>
           <AnimationName>AimRifle</AnimationName>
@@ -506,7 +197,7 @@
         <c:HiddenForLocalPlayer/>
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
-          <Color A="1" B="0" G="0" R="1"/>
+          <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -520,8 +211,8 @@
               <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
             </c:Model>
             <c:Transform>
-              <Position X="0.159282878" Y="1.0300566" Z="-0.216084003"/>
-              <Orientation X="-0.0626799241" Y="-0.0390551724" Z="0.119761385"/>
+              <Position X="0.139178902" Y="0.782200813" Z="-0.246610582"/>
+              <Orientation X="-0.228463098" Y="0.0975924358" Z="0.182726845"/>
             </c:Transform>
           </Components>
           <Children>
@@ -539,7 +230,7 @@
             <Entity name="ThirdPersonReloadSpawner">
               <Components>
                 <c:Spawner>
-                  <EntityFile>Schema/Entities/ReloadEffectWorldRed.xml</EntityFile>
+                  <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform/>
               </Components>
@@ -576,41 +267,6 @@
       </Components>
       <Children/>
     </Entity>
-    <Entity name="PlayerName">
-      <Components>
-        <c:Text>
-          <Content>Insert name here</Content>
-          <Resource>Fonts/DroidSans.ttf,100</Resource>
-          <Color A="1" B="0" G="1" R="0"/>
-        </c:Text>
-        <c:Transform>
-          <Position X="0.100000001" Y="1.50199997" Z="-0.248000011"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
-          <Orientation X="0" Y="3.14199996" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity>
-      <Components>
-        <c:Sprite>
-          <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
-          <GlowMap></GlowMap>
-          <Color A="1" B="0" G="0" R="1"/>
-        </c:Sprite>
-        <c:HiddenForLocalPlayer/>
-        <c:SpriteIndicator>
-          <MinScale>50</MinScale>
-          <VisibleForSingleTeamOnly>true</VisibleForSingleTeamOnly>
-        </c:SpriteIndicator>
-        <c:Transform>
-          <Position X="0" Y="1.84000003" Z="0"/>
-          <Scale X="0.300000012" Y="0.300000012" Z="0.300000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/QualityAssurance.xml

@@ -40,7 +40,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="8433.37305" Z="0"/>
+              <Orientation X="0" Y="7364.79053" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -77,6 +77,18 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="ListenerText">
+          <Components>
+            <c:Text>
+              <Content>Sound Test</Content>
+              <Resource>Fonts/DroidSans.ttf,64</Resource>
+            </c:Text>
+            <c:Transform>
+              <Orientation X="0" Y="3.31600022" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="DirectionalLight">
@@ -93,7 +105,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="2.1529963" Y="6.59221172" Z="0.169116676"/>
-          <Orientation X="4.16300011" Y="18271.9141" Z="0"/>
+          <Orientation X="4.16300011" Y="17199.7988" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -168,7 +180,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="2553.63574" Z="0"/>
+                  <Orientation X="0" Y="2019.28589" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -213,7 +225,7 @@
               <Axis X="1" Y="1" Z="1"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="16862.3945" Y="16862.3945" Z="16862.3945"/>
+              <Orientation X="15792.2051" Y="15792.2051" Z="15792.2051"/>
             </c:Transform>
           </Components>
           <Children>
@@ -277,7 +289,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="16658.3906" Z="0"/>
+              <Orientation X="0" Y="15589.2383" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -309,7 +321,7 @@
                       <Axis X="0.699999988" Y="1" Z="0.300000012"/>
                     </c:RaptorCopter>
                     <c:Transform>
-                      <Orientation X="12206.665" Y="17385.8008" Z="5202.3335"/>
+                      <Orientation X="11456.2695" Y="16313.6973" Z="4881.66504"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -659,7 +671,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -706,7 +718,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -766,7 +778,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -813,7 +825,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -859,7 +871,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -906,7 +918,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -953,7 +965,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="851.386902" Z="0"/>
+                  <Orientation X="0" Y="316.505432" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1015,7 +1027,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="0" G="0" R="1"/>
+                  <Color A="0.300000012" B="0" G="0.200000003" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1065,7 +1077,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                  <Color A="0.300000012" B="0" G="1" R="1"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1155,7 +1167,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="1" R="1"/>
+                  <Color A="0.300000012" B="1" G="1" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team/>
@@ -1205,7 +1217,7 @@
                 </c:CapturePoint>
                 <c:Model>
                   <Resource>Models/Core/UnitCube.mesh</Resource>
-                  <Color A="0.300000012" B="1" G="0" R="0"/>
+                  <Color A="0.300000012" B="1" G="0.200000003" R="0"/>
                   <Transparent>true</Transparent>
                 </c:Model>
                 <c:Team>
@@ -1367,7 +1379,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1376,7 +1388,7 @@
                     <c:ExplosionEffect>
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                      <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                      <TimeSinceDeath>0.75205058136495551</TimeSinceDeath>
                       <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                       <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                       <Randomness>true</Randomness>
@@ -1423,7 +1435,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1432,7 +1444,7 @@
                     <c:ExplosionEffect>
                       <Velocity X="0.5" Y="1" Z="0"/>
                       <ExplosionOrigin X="0" Y="0.900000036" Z="0"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>1.2019563319790627</TimeSinceDeath>
                     </c:ExplosionEffect>
                     <c:Model>
                       <Resource>Models/Characters/Assault/AssaultTPose.mesh</Resource>
@@ -1475,7 +1487,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1385.11243" Z="0"/>
+                  <Orientation X="0" Y="850.207886" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1486,7 +1498,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0.300000012" Y="2" Z="0"/>
                       <ExplosionOrigin X="0" Y="1.30000007" Z="-0.200000003"/>
-                      <TimeSinceDeath>1.8641349174045843</TimeSinceDeath>
+                      <TimeSinceDeath>0.68540211563899389</TimeSinceDeath>
                       <EndColor A="0" B="0.333333343" G="0.933333337" R="3.92156863"/>
                       <Randomness>true</Randomness>
                     </c:ExplosionEffect>
@@ -1531,7 +1543,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="1392.89258" Z="0"/>
+                  <Orientation X="0" Y="857.984314" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1541,7 +1553,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="0" Y="0.699999988" Z="0"/>
                       <ExplosionOrigin X="0" Y="-1.10000002" Z="0"/>
-                      <TimeSinceDeath>1.2301962937648341</TimeSinceDeath>
+                      <TimeSinceDeath>0.95150063648635763</TimeSinceDeath>
                       <ExplosionDuration>10</ExplosionDuration>
                       <EndColor A="1" B="0" G="0" R="1"/>
                       <RandomnessScalar>3</RandomnessScalar>
@@ -1589,7 +1601,7 @@
                   <Axis X="0" Y="1" Z="0"/>
                 </c:RaptorCopter>
                 <c:Transform>
-                  <Orientation X="0" Y="991.007263" Z="0"/>
+                  <Orientation X="0" Y="456.136078" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -1599,7 +1611,7 @@
                       <ColorByDistance>true</ColorByDistance>
                       <Velocity X="6" Y="0.100000001" Z="0"/>
                       <ExplosionOrigin X="0" Y="-10" Z="0"/>
-                      <TimeSinceDeath>3.4214855659573402</TimeSinceDeath>
+                      <TimeSinceDeath>1.3515288978624223</TimeSinceDeath>
                       <ExponentialAccelaration>true</ExponentialAccelaration>
                       <ExplosionDuration>5</ExplosionDuration>
                       <Randomness>true</Randomness>
@@ -1666,10 +1678,10 @@
         </Entity>
         <Entity name="ShieldedCube">
           <Components>
-            <c:Shielded/>
             <c:Model>
               <Resource>Models/Core/UnitCube.mesh</Resource>
             </c:Model>
+            <c:Shielded/>
             <c:Transform>
               <Position X="-3.34650159" Y="1.19966424" Z="3.09996605"/>
             </c:Transform>
@@ -1780,7 +1792,7 @@
                         <c:ExplosionEffect>
                           <ColorByDistance>true</ColorByDistance>
                           <Velocity X="0.800000012" Y="0.0379999988" Z="0"/>
-                          <TimeSinceDeath>0.8256214817261025</TimeSinceDeath>
+                          <TimeSinceDeath>1.3682019578975679</TimeSinceDeath>
                           <ExplosionDuration>3.7999999523162842</ExplosionDuration>
                           <EndColor A="0" B="23.5294113" G="11.7647057" R="0"/>
                           <Randomness>true</Randomness>
@@ -1824,12 +1836,12 @@
             <Entity name="PlayerModel">
               <Components>
                 <c:Animation/>
-                <c:Shielded/>
                 <c:HiddenForLocalPlayer/>
                 <c:Model>
                   <Resource>Models/AssaultAnimated.mesh</Resource>
                   <Color A="1" B="0" G="0" R="1"/>
                 </c:Model>
+                <c:Shielded/>
                 <c:Transform/>
               </Components>
               <Children/>
@@ -2083,7 +2095,7 @@
           <Components>
             <c:Sprite>
               <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
-              <Color A="0.699999988" B="0" G="0" R="1"/>
+              <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
             </c:Sprite>
             <c:Transform>
               <Position X="-1.58304751" Y="0.919596612" Z="0"/>
@@ -2095,7 +2107,7 @@
                 <c:CapturePointHUD/>
                 <c:Fill>
                   <Percentage>1</Percentage>
-                  <Color A="0.699999988" B="0" G="0" R="1"/>
+                  <Color A="0.699999988" B="0" G="0.200000003" R="1"/>
                 </c:Fill>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Core/UnitHexagon_Rotated.png</DiffuseTexture>
@@ -2133,355 +2145,6 @@
         </Entity>
       </Children>
     </Entity>
-    <Entity name="MenuOirign">
-      <Components>
-        <c:Transform>
-          <Position X="-23.0533829" Y="0.938369572" Z="14.068408"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="Camera">
-          <Components>
-            <c:Camera/>
-            <c:Model>
-              <Resource>Models/Widgets/Camera.mesh</Resource>
-              <Visible>false</Visible>
-            </c:Model>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="MenuCenterPoint">
-          <Components>
-            <c:Menu/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="Page0">
-              <Components>
-                <c:Page/>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="MenuBackground">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="-1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Play">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.388422519" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Play</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Host">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.214031488" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Host</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Connecting">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Connect</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Settings">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Settings</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Quit">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Quit</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-            <Entity name="Page1">
-              <Components>
-                <c:Page>
-                  <ID>1</ID>
-                </c:Page>
-                <c:Transform>
-                  <Orientation X="0" Y="0.989000022" Z="0"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="MenuBackground">
-                  <Components>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0" Z="-1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Res1080">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>1920x1080</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Res720">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.199327558" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>1280x720</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="Res480">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>854x480</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                    <Entity name="FullScreen">
-                      <Components>
-                        <c:Button/>
-                        <c:Sprite>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                        </c:Sprite>
-                        <c:Transform>
-                          <Position X="0" Y="-0.164955258" Z="0.0627754927"/>
-                          <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>FullScreen</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Color A="1" B="1" G="0.847058833" R="0"/>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                              <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Text">
-          <Components>
-            <c:Text>
-              <Content>Menu test area</Content>
-              <Resource>Fonts/DroidSans.ttf,64</Resource>
-            </c:Text>
-            <c:Transform>
-              <Position X="0" Y="4.22317314" Z="0"/>
-              <Orientation X="0" Y="1.68700004" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children/>
-        </Entity>
-      </Children>
-    </Entity>
-    <Entity name="ListenerText">
-      <Components>
-        <c:Text>
-          <Content>Sound Test</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-        </c:Text>
-        <c:Transform>
-          <Orientation X="0" Y="3.31600022" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/ReloadEffectViewRed.xml

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

resources/Schema/Entities/ReloadEffectWorld.xml

@@ -10,12 +10,11 @@
       <Velocity X="1.63300014" Y="0.0320000015" Z="0"/>
       <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
       <ExponentialAccelaration>true</ExponentialAccelaration>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="0"/>
+      <EndColor A="0" B="19.6078434" G="19.6078434" R="1"/>
       <Randomness>true</Randomness>
     </c:ExplosionEffect>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-      <Transparent>true</Transparent>
     </c:Model>
     <c:Transform/>
   </Components>

resources/Schema/Entities/ReloadEffectWorldRed.xml

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

resources/Schema/Entities/TestMenu.xml

@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Entity name="MenuOirign" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
-
-  <Components>
-    <c:Transform>
-      <Position X="-23.0533829" Y="0.938369572" Z="14.068408"/>
-    </c:Transform>
-  </Components>
-
-  <Children>
-    <Entity name="Camera">
-      <Components>
-        <c:Camera/>
-        <c:Model>
-          <Resource>Models/Widgets/Camera.mesh</Resource>
-        </c:Model>
-        <c:Transform/>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="MenuCenterPoint">
-      <Components>
-        <c:Menu/>
-        <c:Transform/>
-      </Components>
-      <Children>
-        <Entity name="Page0">
-          <Components>
-            <c:Page/>
-            <c:Transform/>
-          </Components>
-          <Children>
-            <Entity name="MenuBackground">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-1"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.388422519" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Play</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.214031488" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Host</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.0367300175" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Connect</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="-0.148274168" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Settings</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="-0.335298717" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Quit</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-        <Entity name="Page1">
-          <Components>
-            <c:Page>
-              <ID>1</ID>
-            </c:Page>
-            <c:Transform>
-              <Orientation X="0" Y="0.989000022" Z="0"/>
-            </c:Transform>
-          </Components>
-          <Children>
-            <Entity name="MenuBackground">
-              <Components>
-                <c:Sprite>
-                  <DiffuseTexture>Textures/Core/ErrorTexture.png</DiffuseTexture>
-                </c:Sprite>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-1"/>
-                </c:Transform>
-              </Components>
-              <Children>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.375197947" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Resolution</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.199327558" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Option2</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-                <Entity name="Button">
-                  <Components>
-                    <c:Button/>
-                    <c:Sprite>
-                      <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                    </c:Sprite>
-                    <c:Transform>
-                      <Position X="0" Y="0.0159880854" Z="0.0627754927"/>
-                      <Scale X="0.600000024" Y="0.150000006" Z="1"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Butts</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Color A="1" B="1" G="0.847058833" R="0"/>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.00710564246" Y="-0.203304529" Z="0.00999999978"/>
-                          <Scale X="0.300000012" Y="0.699999988" Z="4.30000019"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                  </Children>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
-        </Entity>
-      </Children>
-    </Entity>
-  </Children>
-
-</Entity>

resources/Schema/Types/Entity.xsd

@@ -44,13 +44,8 @@
 							<xs:element ref="c:Shielded" minOccurs="0"/>
 							<xs:element ref="c:CapturePointHUD" minOccurs="0"/>
 							<xs:element ref="c:AmmunitionHUD" 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"/>
-							<xs:element ref="c:WeaponAttachment" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -19,8 +19,6 @@ void main()
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
 	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
 	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
-
-	//hdrColor = hdrColor * SSAO;
 	hdrColor += bloomColor;
 	hdrColorLowRes;
 
@@ -35,6 +33,7 @@ void main()
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));
+
 	fragmentColor = vec4(result, 1.0);
 	//fragmentColor = hdrColor;
 	//fragmentColor = bloomColor;

resources/Shaders/ForwardPlus.frag.glsl

@@ -1,7 +1,5 @@
 #version 430
 
-#define MIN_AMBIENT_LIGHT 0.3
-
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -11,19 +9,15 @@ uniform vec2 ScreenDimensions;
 uniform vec4 FillColor;
 uniform vec4 AmbientColor;
 uniform float FillPercentage;
-uniform float GlowIntensity = 10;
-uniform vec3 CameraPosition;
 
 uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
 uniform vec2 SpecularUVRepeat;
 uniform vec2 GlowUVRepeat;
-layout (binding = 0) uniform sampler2D AOTexture;
-layout (binding = 1) uniform sampler2D DiffuseTexture;
-layout (binding = 2) uniform sampler2D NormalMapTexture;
-layout (binding = 3) uniform sampler2D SpecularMapTexture;
-layout (binding = 4) uniform sampler2D GlowMapTexture;
-layout (binding = 5) uniform samplerCube CubeMap;
+layout (binding = 0) uniform sampler2D DiffuseTexture;
+layout (binding = 1) uniform sampler2D NormalMapTexture;
+layout (binding = 2) uniform sampler2D SpecularMapTexture;
+layout (binding = 3) uniform sampler2D GlowMapTexture;
 
 #define TILE_SIZE 16
 
@@ -78,7 +72,7 @@ struct LightResult {
 };
 
 float CalcAttenuation(float radius, float dist, float falloff) {
-	return 1.0 - smoothstep(radius * falloff, radius, dist);
+	return 1.0 - smoothstep(radius * 0.3, radius, dist);
 }
 
 vec4 CalcSpecular(vec4 lightColor, vec4 viewVec,  vec4 lightVec, vec4 normal) {
@@ -125,8 +119,6 @@ vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textu
 
 void main()
 {
-	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
-	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
@@ -134,18 +126,14 @@ void main()
 	vec4 normal = V * CalcNormalMappedValue(Input.Normal, Input.Tangent, Input.BiTangent, Input.TextureCoordinate * NormalUVRepeat, NormalMapTexture);
 	normal = normalize(normal);
 	//vec4 normal = normalize(V  * vec4(Input.Normal, 0.0));
-	vec4 viewVec = normalize(-position);
-	vec3 I = normalize(vec3(M * vec4(Input.Position, 1.0)) - CameraPosition);
-	vec3 R = reflect(-I, Input.Normal);
-	//R = vec3(P * vec4(R, 1.0));
-	vec4 reflectionColor = texture(CubeMap, R);
+	vec4 viewVec = normalize(-position); 
 
 	vec2 tilePos;
 	tilePos.x = int(gl_FragCoord.x/TILE_SIZE);
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -163,14 +151,12 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
-		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
+		totalLighting.Diffuse += light_result.Diffuse;
+		totalLighting.Specular += light_result.Specular;
 	}
 
 	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;
-	color_result = color_result * clamp(1/specularTexel, 0, 1)*2 + reflectionColor * clamp(specularTexel, 0, 1)/2;
 	//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
 	
 
@@ -180,10 +166,9 @@ void main()
 		color_result += FillColor;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	//sceneColor = vec4(reflectionColor.xyz, 1);
-	color_result += glowTexel*GlowIntensity;
+	color_result += glowTexel*3;
 
-	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), clamp(color_result.a, 0, 1));
+	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
 
 	//Tiled Debug Code
 	/*

resources/Shaders/ForwardPlus.vert.glsl

@@ -23,12 +23,12 @@ out VertexData{
 void main()
 {
 	gl_Position = P*V*M * vec4(Position, 1.0);
-	mat4 TIM = transpose(inverse(M));
+	
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;
-	Output.Normal = vec3(TIM * vec4(Normal, 0.0));
-	Output.Tangent = vec3(TIM * vec4(Tangent, 0.0));
- 	Output.BiTangent = vec3(TIM * vec4(BiTangent, 0.0));
+	Output.Normal = vec3(M * vec4(Normal, 0.0));
+	Output.Tangent = vec3(M * vec4(Tangent, 0.0));
+ 	Output.BiTangent = vec3(M * vec4(BiTangent, 0.0));
 	Output.ExplosionColor = vec4(1.0);
 	Output.ExplosionPercentageElapsed = 0.0;
 }

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -1,7 +1,5 @@
 #version 430
 
-#define MIN_AMBIENT_LIGHT 0.3
-
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -25,20 +23,19 @@ uniform vec2 SpecularUVRepeat3;
 uniform vec2 GlowUVRepeat1;
 uniform vec2 GlowUVRepeat2;
 uniform vec2 GlowUVRepeat3;
-layout (binding = 0) uniform sampler2D AOTexture;
-layout (binding = 1) uniform sampler2D SplatMapTexture;
-layout (binding = 2) uniform sampler2D DiffuseTexture1;
-layout (binding = 3) uniform sampler2D DiffuseTexture2;
-layout (binding = 4) uniform sampler2D DiffuseTexture3;
-layout (binding = 5) uniform sampler2D NormalMapTexture1;
-layout (binding = 6) uniform sampler2D NormalMapTexture2;
-layout (binding = 7) uniform sampler2D NormalMapTexture3;
-layout (binding = 8) uniform sampler2D SpecularMapTexture1;
-layout (binding = 9) uniform sampler2D SpecularMapTexture2;
-layout (binding = 10) uniform sampler2D SpecularMapTexture3;
-layout (binding = 11) uniform sampler2D GlowMapTexture1;
-layout (binding = 12) uniform sampler2D GlowMapTexture2;
-layout (binding = 13) uniform sampler2D GlowMapTexture3;
+layout (binding = 0) uniform sampler2D SplatMapTexture;
+layout (binding = 1) uniform sampler2D DiffuseTexture1;
+layout (binding = 2) uniform sampler2D DiffuseTexture2;
+layout (binding = 3) uniform sampler2D DiffuseTexture3;
+layout (binding = 4) uniform sampler2D NormalMapTexture1;
+layout (binding = 5) uniform sampler2D NormalMapTexture2;
+layout (binding = 6) uniform sampler2D NormalMapTexture3;
+layout (binding = 7) uniform sampler2D SpecularMapTexture1;
+layout (binding = 8) uniform sampler2D SpecularMapTexture2;
+layout (binding = 9) uniform sampler2D SpecularMapTexture3;
+layout (binding = 10) uniform sampler2D GlowMapTexture1;
+layout (binding = 11) uniform sampler2D GlowMapTexture2;
+layout (binding = 12) uniform sampler2D GlowMapTexture3;
 
 #define TILE_SIZE 16
 
@@ -177,9 +174,6 @@ vec4 CalcBlendedNormal(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,
 
 void main()
 {
-	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
-	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
-
 	vec4 splatTexel = texture2D(SplatMapTexture, Input.TextureCoordinate);
 
 	vec4 diffuseTexel = CalcBlendedTexel(splatTexel, DiffuseTexture1, DiffuseTexture2, DiffuseTexture3,
@@ -201,7 +195,7 @@ void main()
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -219,8 +213,8 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
-		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
+		totalLighting.Diffuse += light_result.Diffuse;
+		totalLighting.Specular += light_result.Specular;
 	}
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);