diff --git a/assets b/assets
index 415bbd54..c4898d82 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 415bbd5409174bdd1257db57326f3e1ff66d7faf
+Subproject commit c4898d8281b5584d89b1caf14dab8e5fac120321
diff --git a/resources/Schema/Entities/AssetPedistal.xml b/resources/Schema/Entities/AssetPedistal.xml
new file mode 100644
index 00000000..728a3028
--- /dev/null
+++ b/resources/Schema/Entities/AssetPedistal.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/AssaultWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/QualityAssurance.xml b/resources/Schema/Entities/QualityAssurance.xml
new file mode 100644
index 00000000..018e1121
--- /dev/null
+++ b/resources/Schema/Entities/QualityAssurance.xml
@@ -0,0 +1,1230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitPlane.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+ Audio/crosscounter.wav
+ true
+
+
+
+
+
+
+
+
+
+ SoundEmitter
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sound Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.80000001192092896
+
+
+ Models/DirectionalLightWidget.mesh
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Run
+
+ 1
+
+
+ models/AssaultAnimated.mesh
+
+
+
+
+
+
+
+
+
+
+ Walk
+
+ 1
+
+
+ models/AssaultAnimated.mesh
+
+
+
+
+
+
+
+
+ Animation test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Run
+
+ 1
+
+
+ Models/AssaultAnimated.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/NormSpecIncdMapSphere.mesh
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+
+
+
+ 3
+ 1.1399998664855957
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+
+
+
+ 5.0100002288818359
+ 0.69999998807907104
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+
+
+
+ 4
+ 0.80000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+ Models/NormalMapSphere.mesh
+
+
+
+
+
+
+
+
+
+
+ Models/SpecularMapSphere.mesh
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+
+
+
+ 3
+ 1.1399998664855957
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/IncandescenceMapSphere.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ TextureMap's Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.3999999761581421
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Spawn Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitRaptor.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ Transparency Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/AssaultWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/AssaultWeaponRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Asset Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/SecondaryWeapon.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/AssualtSoft.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/DefenderGunBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/DefenderGunRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+
+
+
+
+
+
+
+
+ Models/Assualt.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CapturePoint Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+ Models/CapturePoint.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Red team home point
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/CapturePoint.mesh
+
+
+
+
+
+
+
+
+ 1
+
+
+ Models/Core/UnitCube.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Free capture point
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/CapturePoint.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+ Models/Core/UnitCube.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+ Blue team home point
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Test/ObstacleCourse.mesh
+
+
+
+
+
+
+
+
+
+
+ Collision Test
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/SpawnPointClusterWithModels.xml b/resources/Schema/Entities/SpawnPointClusterWithModels.xml
new file mode 100644
index 00000000..9c42d0e4
--- /dev/null
+++ b/resources/Schema/Entities/SpawnPointClusterWithModels.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/SpawnerWithPlayerModel.xml b/resources/Schema/Entities/SpawnerWithPlayerModel.xml
new file mode 100644
index 00000000..1274eefa
--- /dev/null
+++ b/resources/Schema/Entities/SpawnerWithPlayerModel.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+ Models/Assault.mesh
+
+
+
+
+
+
+
+
+
diff --git a/src/Engine/Rendering/RenderSystem.cpp b/src/Engine/Rendering/RenderSystem.cpp
index b51ab7f8..eaecf99e 100644
--- a/src/Engine/Rendering/RenderSystem.cpp
+++ b/src/Engine/Rendering/RenderSystem.cpp
@@ -245,7 +245,7 @@ void RenderSystem::Update(double dt)
scene.Viewport = Rectangle(1280, 720);
auto cSceneLight = m_World->GetComponents("SceneLight");
- if (cSceneLight != nullptr) {
+ if (cSceneLight != nullptr && cSceneLight->begin() != cSceneLight->end()) {
m_RenderFrame->Gamma = (double)(*cSceneLight->begin())["Gamma"];
m_RenderFrame->Exposure = (double)(*cSceneLight->begin())["Exposure"];
scene.AmbientColor = (glm::vec4)(*cSceneLight->begin())["AmbientColor"];