AnimationDemo

# Conflicts:
#	src/Engine/Editor/EditorSystem.cpp

include/Engine/Editor/EditorSystem.h

@@ -43,6 +43,7 @@ private:
     EditorGUI::WidgetSpace m_WidgetSpace = EditorGUI::WidgetSpace::Global;
     EntityWrapper m_Widget = EntityWrapper::Invalid;
     EntityWrapper m_CurrentSelection = EntityWrapper::Invalid;
+    glm::vec3 m_CamVelocity;
 
     // Utility functions
     EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);

include/Engine/Input/FirstPersonInputController.h

@@ -213,7 +213,6 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
                     }
                 }
 
-
                 EntityWrapper firstPersonModel = m_PlayerEntity.FirstChildByName("Hands");
                 if (firstPersonModel.Valid()) {
                     if (val > 0) {  // Walk/Run

include/Engine/Network/Client.h

@@ -36,6 +36,7 @@
 #include "Network/ESearchForServers.h"
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
+#include "Core/EWin.h"
 
 class Client : public Network
 {
@@ -107,6 +108,7 @@ private:
     void parseAmmoPickup(Packet& packet);
     void parseRemoveWorld(Packet& packet);
     void parseKDEvent(Packet& packet);
+    void parseWin(Packet& packet);
     void InterpolateFields(Packet& packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
     void identifyPacketLoss();

include/Engine/Network/MessageType.h

@@ -25,6 +25,7 @@ enum class MessageType
     AmmoPickup,
     RemoveWorld,
     KD,
+    Win,
     Invalid
 };
 

include/Engine/Rendering/AnimationSystem.h

@@ -16,6 +16,7 @@
 #include "../Core/EEntityDeleted.h"
 #include "Rendering/ESetBlendWeight.h"
 #include "imgui/imgui.h"
+#include "Input/EInputCommand.h"
 
 class AnimationSystem : public ImpureSystem
 {
@@ -37,7 +38,13 @@ private:
     EventRelay<AnimationSystem, Events::SetBlendWeight> m_ESetBlendWeight;
     bool OnSetBlendWeight(Events::SetBlendWeight& e);
 
+    EventRelay<AnimationSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(Events::InputCommand& e);
+
     std::unordered_map<EntityWrapper, AutoBlendQueue> m_AutoBlendQueues;
+
+    bool Crouch = false;
+    float aimMove = 0;
 };
 
 #endif

include/Engine/Rendering/ShadowPass.h

@@ -69,7 +69,7 @@ private:
 	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
 	std::array<glm::mat4, MAX_SPLITS> m_LightView;
 
-	GLfloat m_NearFarPlane[2] = { -34.f, 27.f };
+	GLfloat m_NearFarPlane[2] = { -128.f, 128.f };
 	GLuint m_ResolutionSizeWidth = 1024 * 2;
 	GLuint m_ResolutionSizeHeight = 1024 * 2;
 

include/Engine/Sound/SoundManager.h

@@ -81,6 +81,7 @@ private:
     void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
     float getDurationSeconds(Source* source);
     float getTimeOffsetSeconds(Source* source);
+    void setTimeOffsetSeconds(Source* source, float timeOffset);
 
     // Specific logic
     void playSound(Source* source);

include/Game/Systems/PlayerMovementSystem.h

@@ -32,6 +32,8 @@ private:
     glm::vec3 m_LastPosition = glm::vec3();
     // Used to track afterimages for sprint effect.
     float m_SprintEffectTimer;
+    // Used to track afterimages for dash effect.
+    float m_DashEffectTimer;
     // The logic for making the sound play when player is moving
     void playerStep(double dt, EntityWrapper player);
     // Spawn a hexagon at origin of an Entity

resources/DefaultInput.ini

@@ -30,5 +30,3 @@ F2=PerformanceTimingResetAllTimers
 F3=PerformanceTimingCreateExcelData
 Comma=SwapToClassPick
 Period=SwapToTeamPick
-Enter=PickClass,1
-F5=DisconnectFromServer

resources/Schema/Components/BoostAssault.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <BoostAssault xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="BoostAssault.xsd">
-  <StrengthOfEffect>2</StrengthOfEffect>
+  <StrengthOfEffect>1.35</StrengthOfEffect>
 </BoostAssault>

resources/Schema/Components/Camera.xml

@@ -2,5 +2,5 @@
 <Camera xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Camera.xsd">
 	<FOV>59</FOV> <!-- 90 horizontal FOV at 1080p -->
 	<NearClip>0.01</NearClip>
-	<FarClip>5000</FarClip>
+	<FarClip>300</FarClip>
 </Camera>

resources/Schema/Components/DefenderWeapon.xml

@@ -10,8 +10,8 @@
 	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
 	<NumPellets>9</NumPellets>
 	<RPM>120</RPM>
-	<ViewPunch>0.03</ViewPunch>
+	<ViewPunch>0.15</ViewPunch>
-	<ViewReturnSpeed>0.2</ViewReturnSpeed>
+	<ViewReturnSpeed>0.3</ViewReturnSpeed>
 	<ReloadTime>0.5</ReloadTime>
 	<TriggerHeld>false</TriggerHeld>
 	<FireCooldown>0</FireCooldown>

resources/Schema/Components/Fade.xml

@@ -3,5 +3,6 @@
 	<FadeTime>1</FadeTime>
 	<Time>0</Time>
 	<Out>true</Out>
+	<Loop>true</Loop>
 	<Reverse>false</Reverse>
 </Fade>

resources/Schema/Components/Fade.xsd

@@ -11,6 +11,9 @@
 				<xs:element name="Out" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>If the entity should fade out or in.</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="Loop" type="t:bool" minOccurs="0">
+					<xs:annotation><xs:documentation>If the effect should loop when it is done.</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="Reverse" type="t:bool" minOccurs="0">
 					<xs:annotation><xs:documentation>If the entity should reverse the fade after finishing, this will double the speed.</xs:documentation></xs:annotation>
 				</xs:element>

resources/Schema/Components/SidearmWeapon.xml

@@ -6,7 +6,9 @@
 	<BaseDamage>20</BaseDamage>
 	<RPM>500</RPM>
 	<Automatic>false</Automatic>
-	<ViewPunch>0.01</ViewPunch>
+	<ViewPunch>0.05</ViewPunch>
+	<MaxTravelAngle>0.174533</MaxTravelAngle> <!-- 0.174533 = 10 degrees -->
+	<ViewReturnSpeed>0.2</ViewReturnSpeed>
 	<ReloadTime>1.0</ReloadTime>
 	<EquipTime>0.5</EquipTime>
 	<TriggerHeld>false</TriggerHeld>
@@ -14,4 +16,5 @@
 	<ReloadQueued>false</ReloadQueued>
 	<IsReloading>false</IsReloading>
 	<ReloadTimer>0</ReloadTimer>
+	<CurrentTravel>0</CurrentTravel>	
 </SidearmWeapon>

resources/Schema/Components/SidearmWeapon.xsd

@@ -36,6 +36,12 @@
 				<xs:element name="ViewPunch" type="t:float" minOccurs="0">
 					<xs:annotation><xs:documentation>View punch in radians for each shell fired</xs:documentation></xs:annotation>
 				</xs:element>
+				<xs:element name="MaxTravelAngle" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>Maximum vertical aim travel angle in radians</xs:documentation></xs:annotation>
+				</xs:element>
+				<xs:element name="ViewReturnSpeed" type="t:float" minOccurs="0">
+					<xs:annotation><xs:documentation>The speed in radians per second the view returns to its original position after being punched</xs:documentation></xs:annotation>
+				</xs:element>
 				<xs:element name="ReloadTime" type="t:double" minOccurs="0">
 					<xs:annotation><xs:documentation>Time it takes to load ONE SHELL into the weapon in seconds</xs:documentation></xs:annotation>
 				</xs:element>
@@ -47,6 +53,7 @@
 				<xs:element name="ReloadQueued" type="t:bool" minOccurs="0"/>
 				<xs:element name="IsReloading" type="t:bool" minOccurs="0"/>
 				<xs:element name="ReloadTimer" type="t:double" minOccurs="0"/>
+				<xs:element name="CurrentTravel" type="t:float" minOccurs="0"/>
 			</xs:all>
 		</xs:complexType>
 	</xs:element>

resources/Schema/Entities/AbilityDemo.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:SceneLight>
+      <AmbientColor A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+      <Gamma>1</Gamma>
+      <Exposure>0.82000017166137695</Exposure>
+    </c:SceneLight>
+    <c:Transform/>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.0199999809265137</GlowIntensity>
+          <Resource>Models/Props/Walls/SciFiWallTop.mesh</Resource>
+          <Color A="1" B="3.92156863" G="1" R="1"/>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="0" Y="58.718792" Z="15.6310005"/>
+          <Orientation X="0" Y="0" Z="3.14199996"/>
+          <Scale X="0.279000014" Y="1" Z="0.279000014"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.5</GlowIntensity>
+          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="-14.4384613" Y="-1.2316848" Z="0"/>
+          <Orientation X="0" Y="2.64800024" Z="0"/>
+          <Scale X="2" Y="3.60000014" Z="1.9000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Collidable/>
+        <c:Model>
+          <GlowIntensity>1.5</GlowIntensity>
+          <Resource>Models/Props/Pillars/SciFiPillar2Blue.mesh</Resource>
+          <Shadow>false</Shadow>
+        </c:Model>
+        <c:Transform>
+          <Position X="14.3019333" Y="-1.12725353" Z="0"/>
+          <Orientation X="0" Y="3.84800029" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Dir">
+      <Components>
+        <c:DirectionalLight>
+          <Color A="1" B="0.725490212" G="0.75686276" R="0.741176486"/>
+          <Intensity>1.0699999332427979</Intensity>
+        </c:DirectionalLight>
+        <c:Transform>
+          <Orientation X="3.68318534" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Cam">
+      <Components>
+        <c:Camera/>
+        <c:Model>
+          <Resource>Models/Core/UnitSphere.mesh</Resource>
+          <Shadow>false</Shadow>
+          <NormalMap>false</NormalMap>
+          <DiffuseTexture>false</DiffuseTexture>
+          <SpecularMap>false</SpecularMap>
+          <GlowMap>false</GlowMap>
+        </c:Model>
+        <c:Transform>
+          <Position X="0.100000001" Y="-0.0670000017" Z="-32.8670006"/>
+          <Orientation X="0" Y="3.1400001" Z="0"/>
+          <Scale X="0.100000001" Y="0.100000001" Z="0.100000001"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Spawn">
+      <Components>
+        <c:PlayerSpawn>
+          <AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+          <DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+          <SniperFile></SniperFile>
+        </c:PlayerSpawn>
+        <c:Model>
+          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+        </c:Model>
+        <c:Spawner>
+          <EntityFile></EntityFile>
+        </c:Spawner>
+        <c:Transform>
+          <Position X="0.100000001" Y="2.8398931" Z="-29.0827847"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/DashEffect.xml

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

resources/Schema/Entities/MovementTest.xml

@@ -3,7 +3,7 @@
 
   <Components>
     <c:CapturePointGameMode>
-      <RespawnTime>0.35657206405745967</RespawnTime>
+      <RespawnTime>0.10012471663946698</RespawnTime>
       <MaxRespawnTime>0.5</MaxRespawnTime>
     </c:CapturePointGameMode>
     <c:Transform>
@@ -19,7 +19,11 @@
             <Red/>
           </Team>
         </c:Team>
-        <c:PlayerSpawn/>
+        <c:PlayerSpawn>
+          <AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+          <DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+          <SniperFile></SniperFile>
+        </c:PlayerSpawn>
         <c:Spawner>
           <EntityFile>Schema/Entities/PlayerDefenderBlue.xml</EntityFile>
         </c:Spawner>
@@ -90,7 +94,11 @@
             <Blue/>
           </Team>
         </c:Team>
-        <c:PlayerSpawn/>
+        <c:PlayerSpawn>
+          <AssaultFile>Schema/Entities/PlayerAssaultBlue.xml</AssaultFile>
+          <DefenderFile>Schema/Entities/PlayerDefenderBlue.xml</DefenderFile>
+          <SniperFile></SniperFile>
+        </c:PlayerSpawn>
         <c:Spawner>
           <EntityFile>Schema/Entities/PlayerAssaultBlue.xml</EntityFile>
         </c:Spawner>
@@ -107,7 +115,7 @@
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="0.800000012" Y="0" Z="0"/>
+              <Position X="-0.600000024" Y="0" Z="0.549540162"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -120,7 +128,7 @@
               <Color A="1" B="1" G="0.254901975" R="0"/>
             </c:Model>
             <c:Transform>
-              <Position X="-0.600000024" Y="0" Z="0.549540162"/>
+              <Position X="0.800000012" Y="0" Z="0"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -269,7 +277,7 @@
         </c:RaptorCopter>
         <c:Transform>
           <Position X="0" Y="-30.6910019" Z="0"/>
-          <Orientation X="0" Y="39.1253624" Z="0"/>
+          <Orientation X="0" Y="43.4443054" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
@@ -417,7 +425,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>AssaultPoseF</AnimationName>
-                                  <Time>2.2728534617500387</Time>
+                                  <Time>0.65905298965262915</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -433,7 +441,7 @@
                                   <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="0.160869107" Y="1.21713078" Z="-0.151224568"/>
+                                  <Position X="0.160869107" Y="1.21468747" Z="-0.151224568"/>
                                   <Orientation X="1.90465617" Y="-0.166544378" Z="0.0701896623"/>
                                 </c:Transform>
                               </Components>
@@ -816,7 +824,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>DefenderPoseF</AnimationName>
-                                  <Time>1.4396916405947664</Time>
+                                  <Time>2.3258911684973569</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -832,8 +840,8 @@
                                   <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="0.196064115" Y="0.705373585" Z="0.0272535309"/>
+                                  <Position X="0.195810497" Y="0.711551607" Z="0.0388058722"/>
-                                  <Orientation X="-1.3924278" Y="-0.0973875821" Z="0.332219422"/>
+                                  <Orientation X="-1.3924278" Y="-0.0973876044" Z="0.332219511"/>
                                 </c:Transform>
                               </Components>
                               <Children/>
@@ -1089,22 +1097,6 @@
                             <c:Transform/>
                           </Components>
                           <Children>
-                            <Entity name="BottomRight">
-                              <Components>
-                                <c:Sprite>
-                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                  <GlowMap></GlowMap>
-                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                  <Linear>false</Linear>
-                                </c:Sprite>
-                                <c:Transform>
-                                  <Position X="0.142000005" Y="-0.21800001" Z="0.00499999989"/>
-                                  <Orientation X="0" Y="0" Z="4.71199989"/>
-                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
                             <Entity name="TopRight">
                               <Components>
                                 <c:Sprite>
@@ -1136,6 +1128,22 @@
                               </Components>
                               <Children/>
                             </Entity>
+                            <Entity name="BottomRight">
+                              <Components>
+                                <c:Sprite>
+                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                  <GlowMap></GlowMap>
+                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                  <Linear>false</Linear>
+                                </c:Sprite>
+                                <c:Transform>
+                                  <Position X="0.142000005" Y="-0.21800001" Z="0.00499999989"/>
+                                  <Orientation X="0" Y="0" Z="4.71199989"/>
+                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
                             <Entity name="TopLeft">
                               <Components>
                                 <c:Sprite>
@@ -1177,7 +1185,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>SniperPoseF</AnimationName>
-                                  <Time>1.6727845840185651</Time>
+                                  <Time>0.058984111921155602</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -1193,8 +1201,8 @@
                                   <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="-0.0454485044" Y="1.06437671" Z="-0.125484675"/>
+                                  <Position X="-0.0454485416" Y="1.07162762" Z="-0.12548463"/>
-                                  <Orientation X="-1.50533736" Y="1.34000039" Z="-1.34724414"/>
+                                  <Orientation X="-1.50533807" Y="1.34000039" Z="-1.34724486"/>
                                 </c:Transform>
                               </Components>
                               <Children/>
@@ -1428,14 +1436,14 @@
                 <Entity name="PickTeamHUD">
                   <Components>
                     <c:Transform>
-                      <Position X="0" Y="0" Z="-0.63500005"/>
+                      <Position X="0" Y="0.0200000014" Z="-0.63500005"/>
                     </c:Transform>
                   </Components>
                   <Children>
                     <Entity name="TeamBluePick">
                       <Components>
                         <c:Transform>
-                          <Position X="-0.114000008" Y="0.0190000013" Z="0"/>
+                          <Position X="-0.131000012" Y="0.0190000013" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1447,14 +1455,14 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                               <BlurBackground>true</BlurBackground>
-                              <Color A="0.392156869" B="0.349019617" G="0" R="0"/>
+                              <Color A="0.392156869" B="0.768627465" G="0" R="0"/>
                             </c:Sprite>
                             <c:InputCmdButton>
                               <Command>PickTeam</Command>
                               <PressValue>3</PressValue>
                             </c:InputCmdButton>
                             <c:Transform>
-                              <Scale X="0.207000017" Y="0.249000013" Z="1"/>
+                              <Scale X="0.24000001" Y="0.307000011" Z="1"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -1471,9 +1479,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="0.100000001" Y="-0.121000007" Z="0.00499999989"/>
+                                  <Position X="0.118000008" Y="-0.150000006" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="4.71199989"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1487,9 +1496,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="0.100000001" Y="0.120000005" Z="0.00499999989"/>
+                                  <Position X="0.118000008" Y="0.150000006" Z="0.00499999989"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
                               </Components>
@@ -1502,9 +1512,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="-0.100000001" Y="-0.121000007" Z="0.00499999989"/>
+                                  <Position X="-0.117000006" Y="-0.150000006" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="3.14900017"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1518,9 +1529,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="-0.100000001" Y="0.121000007" Z="0.00499999989"/>
+                                  <Position X="-0.117000006" Y="0.150000006" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="1.5710001"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1534,6 +1546,7 @@
                             <c:Text>
                               <Content>Blue</Content>
                               <Resource>Fonts/DroidSans.ttf,64</Resource>
+                              <Visible>false</Visible>
                               <Alignment>
                                 <Left/>
                               </Alignment>
@@ -1545,127 +1558,27 @@
                           </Components>
                           <Children/>
                         </Entity>
-                      </Children>
+                        <Entity>
-                    </Entity>
-                    <Entity name="TeamRedPick">
-                      <Components>
-                        <c:Transform>
-                          <Position X="0.114" Y="0.0189999994" Z="0"/>
-                        </c:Transform>
-                      </Components>
-                      <Children>
-                        <Entity name="Button_1">
                           <Components>
-                            <c:Button/>
                             <c:Sprite>
                               <Model>Models/Core/UnitQuad.mesh</Model>
                               <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <DiffuseTexture>Textures/HUD/BlueTeam.png</DiffuseTexture>
-                              <BlurBackground>true</BlurBackground>
+                              <ClampToBorder>true</ClampToBorder>
-                              <Color A="0.392156869" B="0" G="0" R="0.556862772"/>
                             </c:Sprite>
-                            <c:InputCmdButton>
-                              <Command>PickTeam</Command>
-                              <PressValue>2</PressValue>
-                            </c:InputCmdButton>
                             <c:Transform>
-                              <Scale X="0.207000017" Y="0.249000013" Z="1"/>
+                              <Position X="0" Y="-0.00900000054" Z="0.00600000005"/>
+                              <Scale X="0.340000004" Y="0.340000004" Z="1"/>
                             </c:Transform>
                           </Components>
                           <Children/>
                         </Entity>
-                        <Entity name="Text">
-                          <Components>
-                            <c:Text>
-                              <Content>Red</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
-                              <Alignment>
-                                <Left/>
-                              </Alignment>
-                            </c:Text>
-                            <c:Transform>
-                              <Position X="-0.0890000015" Y="-0.105000004" Z="0.00499999989"/>
-                              <Scale X="0.0500000007" Y="0.0500000007" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="ButtonCorner_Origin">
-                          <Components>
-                            <c:Transform/>
-                          </Components>
-                          <Children>
-                            <Entity name="BottomRight">
-                              <Components>
-                                <c:Sprite>
-                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                  <GlowMap></GlowMap>
-                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                  <Linear>false</Linear>
-                                </c:Sprite>
-                                <c:Transform>
-                                  <Position X="0.100000001" Y="-0.121000007" Z="0.00499999989"/>
-                                  <Orientation X="0" Y="0" Z="4.71199989"/>
-                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="TopRight">
-                              <Components>
-                                <c:Sprite>
-                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                  <GlowMap></GlowMap>
-                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                  <Linear>false</Linear>
-                                </c:Sprite>
-                                <c:Transform>
-                                  <Position X="0.100000001" Y="0.120000005" Z="0.00499999989"/>
-                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="BottomLeft">
-                              <Components>
-                                <c:Sprite>
-                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                  <GlowMap></GlowMap>
-                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                  <Linear>false</Linear>
-                                </c:Sprite>
-                                <c:Transform>
-                                  <Position X="-0.100000001" Y="-0.121000007" Z="0.00499999989"/>
-                                  <Orientation X="0" Y="0" Z="3.14900017"/>
-                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                            <Entity name="TopLeft">
-                              <Components>
-                                <c:Sprite>
-                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                  <GlowMap></GlowMap>
-                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                  <Linear>false</Linear>
-                                </c:Sprite>
-                                <c:Transform>
-                                  <Position X="-0.100000001" Y="0.121000007" Z="0.00499999989"/>
-                                  <Orientation X="0" Y="0" Z="1.5710001"/>
-                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                </c:Transform>
-                              </Components>
-                              <Children/>
-                            </Entity>
-                          </Children>
-                        </Entity>
                       </Children>
                     </Entity>
                     <Entity name="TeamSpectatorPick">
                       <Components>
                         <c:Transform>
-                          <Position X="0" Y="-0.153000012" Z="0"/>
+                          <Position X="0" Y="-0.184000015" Z="0"/>
                         </c:Transform>
                       </Components>
                       <Children>
@@ -1680,11 +1593,11 @@
                               <Color A="0.392156869" B="0" G="0" R="0"/>
                             </c:Sprite>
                             <c:InputCmdButton>
-                              <Command>PickTeam</Command>
+                              <Command>PickTeam_</Command>
                               <PressValue>1</PressValue>
                             </c:InputCmdButton>
                             <c:Transform>
-                              <Scale X="0.435000032" Y="0.0520000011" Z="1"/>
+                              <Scale X="0.502000034" Y="0.0530000031" Z="1"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -1693,7 +1606,7 @@
                           <Components>
                             <c:Text>
                               <Content>Spectator</Content>
-                              <Resource>Fonts/DroidSans.ttf,64</Resource>
+                              <Resource>Fonts/Hind-Edited.otf,64</Resource>
                             </c:Text>
                             <c:Transform>
                               <Position X="0" Y="-0.00800000038" Z="0.00499999989"/>
@@ -1714,9 +1627,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="0.214000016" Y="-0.0230000019" Z="0.00499999989"/>
+                                  <Position X="0.248000011" Y="-0.0230000019" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="4.71199989"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1730,9 +1644,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="0.214000002" Y="0.0240000002" Z="0.00499999989"/>
+                                  <Position X="0.247000009" Y="0.0240000002" Z="0.00499999989"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
                               </Components>
@@ -1745,9 +1660,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="-0.214000002" Y="-0.023" Z="0.00499999989"/>
+                                  <Position X="-0.247000009" Y="-0.023" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="3.14900017"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1761,9 +1677,10 @@
                                   <GlowMap></GlowMap>
                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                                   <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
                                 </c:Sprite>
                                 <c:Transform>
-                                  <Position X="-0.214000002" Y="0.0240000002" Z="0.00499999989"/>
+                                  <Position X="-0.247000009" Y="0.0240000002" Z="0.00499999989"/>
                                   <Orientation X="0" Y="0" Z="1.5710001"/>
                                   <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                                 </c:Transform>
@@ -1774,6 +1691,141 @@
                         </Entity>
                       </Children>
                     </Entity>
+                    <Entity name="TeamRedPick">
+                      <Components>
+                        <c:Transform>
+                          <Position X="0.130999997" Y="0.0190000013" Z="0"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="Button_1">
+                          <Components>
+                            <c:Button/>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                              <BlurBackground>true</BlurBackground>
+                              <Color A="0.392156869" B="0" G="0" R="0.90196079"/>
+                            </c:Sprite>
+                            <c:InputCmdButton>
+                              <Command>PickTeam</Command>
+                              <PressValue>2</PressValue>
+                            </c:InputCmdButton>
+                            <c:Transform>
+                              <Scale X="0.24000001" Y="0.307000011" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="ButtonCorner_Origin">
+                          <Components>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="BottomRight">
+                              <Components>
+                                <c:Sprite>
+                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                  <GlowMap></GlowMap>
+                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                  <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
+                                </c:Sprite>
+                                <c:Transform>
+                                  <Position X="0.118000008" Y="-0.150000006" Z="0.00499999989"/>
+                                  <Orientation X="0" Y="0" Z="4.71199989"/>
+                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="TopRight">
+                              <Components>
+                                <c:Sprite>
+                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                  <GlowMap></GlowMap>
+                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                  <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
+                                </c:Sprite>
+                                <c:Transform>
+                                  <Position X="0.118000008" Y="0.150000006" Z="0.00499999989"/>
+                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="BottomLeft">
+                              <Components>
+                                <c:Sprite>
+                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                  <GlowMap></GlowMap>
+                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                  <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
+                                </c:Sprite>
+                                <c:Transform>
+                                  <Position X="-0.117000006" Y="-0.150000006" Z="0.00499999989"/>
+                                  <Orientation X="0" Y="0" Z="3.14900017"/>
+                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="TopLeft">
+                              <Components>
+                                <c:Sprite>
+                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                  <GlowMap></GlowMap>
+                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                  <Linear>false</Linear>
+                                  <ClampToBorder>true</ClampToBorder>
+                                </c:Sprite>
+                                <c:Transform>
+                                  <Position X="-0.117000006" Y="0.150000006" Z="0.00499999989"/>
+                                  <Orientation X="0" Y="0" Z="1.5710001"/>
+                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                </c:Transform>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Text">
+                          <Components>
+                            <c:Text>
+                              <Content>Blue</Content>
+                              <Resource>Fonts/DroidSans.ttf,64</Resource>
+                              <Visible>false</Visible>
+                              <Alignment>
+                                <Left/>
+                              </Alignment>
+                            </c:Text>
+                            <c:Transform>
+                              <Position X="-0.00900000054" Y="-0.105000004" Z="0.00499999989"/>
+                              <Scale X="0.0500000007" Y="0.0500000007" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity>
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/RedTeam.png</DiffuseTexture>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0" Y="-0.00900000054" Z="0.00600000005"/>
+                              <Scale X="0.340000004" Y="0.340000004" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
                   </Children>
                 </Entity>
               </Children>
@@ -2182,6 +2234,60 @@
                         </Entity>
                       </Children>
                     </Entity>
+                    <Entity name="KillFeed">
+                      <Components>
+                        <c:KillFeed/>
+                        <c:Transform>
+                          <Position X="0.494000018" Y="0.252000004" 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/Hind-Edited.otf,64</Resource>
+                              <Alignment>
+                                <Right/>
+                              </Alignment>
+                            </c:Text>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="KillFeed2">
+                          <Components>
+                            <c:Text>
+                              <Content></Content>
+                              <Resource>Fonts/Hind-Edited.otf,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/Hind-Edited.otf,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>
               </Children>
@@ -2322,7 +2428,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>AssaultPoseF</AnimationName>
-                                  <Time>0.9949657277747761</Time>
+                                  <Time>1.8811652556773666</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -2338,7 +2444,7 @@
                                   <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="0.160869107" Y="1.21340287" Z="-0.151224568"/>
+                                  <Position X="0.160869107" Y="1.21425688" Z="-0.151224568"/>
                                   <Orientation X="1.90465617" Y="-0.166544378" Z="0.0701896623"/>
                                 </c:Transform>
                               </Components>
@@ -2721,7 +2827,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>DefenderPoseF</AnimationName>
-                                  <Time>1.0951743489513674</Time>
+                                  <Time>1.9813738768539579</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -2737,8 +2843,8 @@
                                   <Resource>Models/Weapons/Red/DefenderWeaponRed.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="0.195622981" Y="0.70677036" Z="0.0300085638"/>
+                                  <Position X="0.195940435" Y="0.708098531" Z="0.0331460983"/>
-                                  <Orientation X="-1.39242733" Y="-0.0973875821" Z="0.332219303"/>
+                                  <Orientation X="-1.39242768" Y="-0.0973874852" Z="0.332219243"/>
                                 </c:Transform>
                               </Components>
                               <Children/>
@@ -3082,7 +3188,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>SniperPoseF</AnimationName>
-                                  <Time>1.0119983488063795</Time>
+                                  <Time>1.89819787670897</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -3098,8 +3204,8 @@
                                   <Resource>Models/Weapons/Red/SecondaryWeaponRed.mesh</Resource>
                                 </c:Model>
                                 <c:Transform>
-                                  <Position X="-0.045448523" Y="1.06568146" Z="-0.125484601"/>
+                                  <Position X="-0.0454485491" Y="1.06597364" Z="-0.125484616"/>
-                                  <Orientation X="-1.50533819" Y="1.34000111" Z="-1.3472451"/>
+                                  <Orientation X="-1.50533819" Y="1.34000039" Z="-1.34724486"/>
                                 </c:Transform>
                               </Components>
                               <Children/>

resources/Schema/Entities/OverwatchCamera.xml

@@ -8,7 +8,7 @@
     </c:RaptorCopter>
     <c:Transform>
       <Position X="0" Y="-30.6910019" Z="0"/>
-      <Orientation X="0" Y="43.1977272" Z="0"/>
+      <Orientation X="0" Y="43.2517357" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -69,6 +69,21 @@
                         <c:Transform/>
                       </Components>
                       <Children>
+                        <Entity name="TopRight">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.142000005" Y="0.217999995" Z="0.00499999989"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
                         <Entity name="BottomRight">
                           <Components>
                             <c:Sprite>
@@ -85,21 +100,6 @@
                           </Components>
                           <Children/>
                         </Entity>
-                        <Entity name="TopRight">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.142000005" Y="0.217999995" Z="0.00499999989"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
                         <Entity name="BottomLeft">
                           <Components>
                             <c:Sprite>
@@ -157,7 +157,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>AssaultPoseF</AnimationName>
-                              <Time>1.725669683907423</Time>
+                              <Time>0.32571926651889171</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -173,7 +173,7 @@
                               <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="0.160869107" Y="1.21322453" Z="-0.151224568"/>
+                              <Position X="0.160869107" Y="1.21624839" Z="-0.151224568"/>
                               <Orientation X="1.90465617" Y="-0.166544378" Z="0.0701896623"/>
                             </c:Transform>
                           </Components>
@@ -556,7 +556,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>DefenderPoseF</AnimationName>
-                              <Time>0.89250786275215077</Time>
+                              <Time>1.9925574453636195</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -572,8 +572,8 @@
                               <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="0.195243329" Y="0.708130419" Z="0.0326478258"/>
+                              <Position X="0.195935503" Y="0.708206475" Z="0.0333581194"/>
-                              <Orientation X="-1.39242756" Y="-0.0973875225" Z="0.332219273"/>
+                              <Orientation X="-1.39242768" Y="-0.0973875299" Z="0.332219183"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -829,6 +829,22 @@
                         <c:Transform/>
                       </Components>
                       <Children>
+                        <Entity name="BottomLeft">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="-0.142000005" Y="-0.217999995" Z="0.00499999989"/>
+                              <Orientation X="0" Y="0" Z="3.14900017"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
                         <Entity name="BottomRight">
                           <Components>
                             <c:Sprite>
@@ -860,22 +876,6 @@
                           </Components>
                           <Children/>
                         </Entity>
-                        <Entity name="BottomLeft">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="-0.142000005" Y="-0.217999995" Z="0.00499999989"/>
-                              <Orientation X="0" Y="0" Z="3.14900017"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
                         <Entity name="TopLeft">
                           <Components>
                             <c:Sprite>
@@ -917,7 +917,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>SniperPoseF</AnimationName>
-                              <Time>1.1256008061759495</Time>
+                              <Time>2.2256503887874182</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -933,8 +933,8 @@
                               <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="-0.0454485789" Y="1.06511343" Z="-0.125484645"/>
+                              <Position X="-0.0454485565" Y="1.06937242" Z="-0.125484601"/>
-                              <Orientation X="-1.50533736" Y="1.34000039" Z="-1.34724438"/>
+                              <Orientation X="-1.50533795" Y="1.34000087" Z="-1.34724462"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -1168,14 +1168,14 @@
             <Entity name="PickTeamHUD">
               <Components>
                 <c:Transform>
-                  <Position X="0" Y="0" Z="-0.63500005"/>
+                  <Position X="0" Y="0.0200000014" Z="-0.63500005"/>
                 </c:Transform>
               </Components>
               <Children>
                 <Entity name="TeamBluePick">
                   <Components>
                     <c:Transform>
-                      <Position X="-0.114000008" Y="0.0190000013" Z="0"/>
+                      <Position X="-0.131000012" Y="0.0190000013" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -1187,14 +1187,14 @@
                           <GlowMap></GlowMap>
                           <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
                           <BlurBackground>true</BlurBackground>
-                          <Color A="0.392156869" B="0.349019617" G="0" R="0"/>
+                          <Color A="0.392156869" B="0.768627465" G="0" R="0"/>
                         </c:Sprite>
                         <c:InputCmdButton>
                           <Command>PickTeam</Command>
                           <PressValue>3</PressValue>
                         </c:InputCmdButton>
                         <c:Transform>
-                          <Scale X="0.207000017" Y="0.249000013" Z="1"/>
+                          <Scale X="0.24000001" Y="0.307000011" Z="1"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -1211,9 +1211,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="0.100000001" Y="-0.121000007" Z="0.00499999989"/>
+                              <Position X="0.118000008" Y="-0.150000006" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="4.71199989"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1227,9 +1228,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="0.100000001" Y="0.120000005" Z="0.00499999989"/>
+                              <Position X="0.118000008" Y="0.150000006" Z="0.00499999989"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
                           </Components>
@@ -1242,9 +1244,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="-0.100000001" Y="-0.121000007" Z="0.00499999989"/>
+                              <Position X="-0.117000006" Y="-0.150000006" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="3.14900017"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1258,9 +1261,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="-0.100000001" Y="0.121000007" Z="0.00499999989"/>
+                              <Position X="-0.117000006" Y="0.150000006" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="1.5710001"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1274,6 +1278,7 @@
                         <c:Text>
                           <Content>Blue</Content>
                           <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
                           <Alignment>
                             <Left/>
                           </Alignment>
@@ -1285,127 +1290,27 @@
                       </Components>
                       <Children/>
                     </Entity>
-                  </Children>
+                    <Entity>
-                </Entity>
-                <Entity name="TeamRedPick">
-                  <Components>
-                    <c:Transform>
-                      <Position X="0.114" Y="0.0189999994" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children>
-                    <Entity name="Button_1">
                       <Components>
-                        <c:Button/>
                         <c:Sprite>
                           <Model>Models/Core/UnitQuad.mesh</Model>
                           <GlowMap></GlowMap>
-                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <DiffuseTexture>Textures/HUD/BlueTeam.png</DiffuseTexture>
-                          <BlurBackground>true</BlurBackground>
+                          <ClampToBorder>true</ClampToBorder>
-                          <Color A="0.392156869" B="0" G="0" R="0.556862772"/>
                         </c:Sprite>
-                        <c:InputCmdButton>
-                          <Command>PickTeam</Command>
-                          <PressValue>2</PressValue>
-                        </c:InputCmdButton>
                         <c:Transform>
-                          <Scale X="0.207000017" Y="0.249000013" Z="1"/>
+                          <Position X="0" Y="-0.00900000054" Z="0.00600000005"/>
+                          <Scale X="0.340000004" Y="0.340000004" Z="1"/>
                         </c:Transform>
                       </Components>
                       <Children/>
                     </Entity>
-                    <Entity name="Text">
-                      <Components>
-                        <c:Text>
-                          <Content>Red</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
-                          <Alignment>
-                            <Left/>
-                          </Alignment>
-                        </c:Text>
-                        <c:Transform>
-                          <Position X="-0.0890000015" Y="-0.105000004" Z="0.00499999989"/>
-                          <Scale X="0.0500000007" Y="0.0500000007" Z="1"/>
-                        </c:Transform>
-                      </Components>
-                      <Children/>
-                    </Entity>
-                    <Entity name="ButtonCorner_Origin">
-                      <Components>
-                        <c:Transform/>
-                      </Components>
-                      <Children>
-                        <Entity name="BottomRight">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.100000001" Y="-0.121000007" Z="0.00499999989"/>
-                              <Orientation X="0" Y="0" Z="4.71199989"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="TopRight">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="0.100000001" Y="0.120000005" Z="0.00499999989"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="BottomLeft">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="-0.100000001" Y="-0.121000007" Z="0.00499999989"/>
-                              <Orientation X="0" Y="0" Z="3.14900017"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                        <Entity name="TopLeft">
-                          <Components>
-                            <c:Sprite>
-                              <Model>Models/Core/UnitQuad.mesh</Model>
-                              <GlowMap></GlowMap>
-                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                              <Linear>false</Linear>
-                            </c:Sprite>
-                            <c:Transform>
-                              <Position X="-0.100000001" Y="0.121000007" Z="0.00499999989"/>
-                              <Orientation X="0" Y="0" Z="1.5710001"/>
-                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                            </c:Transform>
-                          </Components>
-                          <Children/>
-                        </Entity>
-                      </Children>
-                    </Entity>
                   </Children>
                 </Entity>
                 <Entity name="TeamSpectatorPick">
                   <Components>
                     <c:Transform>
-                      <Position X="0" Y="-0.153000012" Z="0"/>
+                      <Position X="0" Y="-0.184000015" Z="0"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -1420,11 +1325,11 @@
                           <Color A="0.392156869" B="0" G="0" R="0"/>
                         </c:Sprite>
                         <c:InputCmdButton>
-                          <Command>PickTeam</Command>
+                          <Command>PickTeam_</Command>
                           <PressValue>1</PressValue>
                         </c:InputCmdButton>
                         <c:Transform>
-                          <Scale X="0.435000032" Y="0.0520000011" Z="1"/>
+                          <Scale X="0.502000034" Y="0.0530000031" Z="1"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -1433,7 +1338,7 @@
                       <Components>
                         <c:Text>
                           <Content>Spectator</Content>
-                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Resource>Fonts/Hind-Edited.otf,64</Resource>
                         </c:Text>
                         <c:Transform>
                           <Position X="0" Y="-0.00800000038" Z="0.00499999989"/>
@@ -1454,9 +1359,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="0.214000016" Y="-0.0230000019" Z="0.00499999989"/>
+                              <Position X="0.248000011" Y="-0.0230000019" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="4.71199989"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1470,9 +1376,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="0.214000002" Y="0.0240000002" Z="0.00499999989"/>
+                              <Position X="0.247000009" Y="0.0240000002" Z="0.00499999989"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
                           </Components>
@@ -1485,9 +1392,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="-0.214000002" Y="-0.023" Z="0.00499999989"/>
+                              <Position X="-0.247000009" Y="-0.023" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="3.14900017"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1501,9 +1409,10 @@
                               <GlowMap></GlowMap>
                               <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
                               <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
                             </c:Sprite>
                             <c:Transform>
-                              <Position X="-0.214000002" Y="0.0240000002" Z="0.00499999989"/>
+                              <Position X="-0.247000009" Y="0.0240000002" Z="0.00499999989"/>
                               <Orientation X="0" Y="0" Z="1.5710001"/>
                               <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
                             </c:Transform>
@@ -1514,6 +1423,141 @@
                     </Entity>
                   </Children>
                 </Entity>
+                <Entity name="TeamRedPick">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0.130999997" Y="0.0190000013" Z="0"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="Button_1">
+                      <Components>
+                        <c:Button/>
+                        <c:Sprite>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
+                          <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <BlurBackground>true</BlurBackground>
+                          <Color A="0.392156869" B="0" G="0" R="0.90196079"/>
+                        </c:Sprite>
+                        <c:InputCmdButton>
+                          <Command>PickTeam</Command>
+                          <PressValue>2</PressValue>
+                        </c:InputCmdButton>
+                        <c:Transform>
+                          <Scale X="0.24000001" Y="0.307000011" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="ButtonCorner_Origin">
+                      <Components>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="BottomRight">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.118000008" Y="-0.150000006" Z="0.00499999989"/>
+                              <Orientation X="0" Y="0" Z="4.71199989"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="TopRight">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.118000008" Y="0.150000006" Z="0.00499999989"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="BottomLeft">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="-0.117000006" Y="-0.150000006" Z="0.00499999989"/>
+                              <Orientation X="0" Y="0" Z="3.14900017"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="TopLeft">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                              <Linear>false</Linear>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="-0.117000006" Y="0.150000006" Z="0.00499999989"/>
+                              <Orientation X="0" Y="0" Z="1.5710001"/>
+                              <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Text">
+                      <Components>
+                        <c:Text>
+                          <Content>Blue</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                          <Alignment>
+                            <Left/>
+                          </Alignment>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="-0.00900000054" Y="-0.105000004" Z="0.00499999989"/>
+                          <Scale X="0.0500000007" Y="0.0500000007" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity>
+                      <Components>
+                        <c:Sprite>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
+                          <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/HUD/RedTeam.png</DiffuseTexture>
+                          <ClampToBorder>true</ClampToBorder>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0" Y="-0.00900000054" Z="0.00600000005"/>
+                          <Scale X="0.340000004" Y="0.340000004" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
               </Children>
             </Entity>
           </Children>
@@ -1534,7 +1578,7 @@
                 <Entity name="RespawnTimer">
                   <Components>
                     <c:Text>
-                      <Content>2</Content>
+                      <Content>1</Content>
                       <Resource>Fonts/DroidSans.ttf,64</Resource>
                       <Color A="1" B="0" G="1" R="0.784313738"/>
                     </c:Text>
@@ -2116,7 +2160,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>AssaultPoseF</AnimationName>
-                              <Time>0.44778194993216047</Time>
+                              <Time>1.5478315325436292</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -2132,7 +2176,7 @@
                               <Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="0.160869107" Y="1.21565855" Z="-0.151224568"/>
+                              <Position X="0.160869107" Y="1.21257317" Z="-0.151224568"/>
                               <Orientation X="1.90465617" Y="-0.166544378" Z="0.0701896623"/>
                             </c:Transform>
                           </Components>
@@ -2515,7 +2559,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>DefenderPoseF</AnimationName>
-                              <Time>0.54799057110875182</Time>
+                              <Time>1.6480401537202205</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -2531,8 +2575,8 @@
                               <Resource>Models/Weapons/Red/DefenderWeaponRed.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="0.194819659" Y="0.710372686" Z="0.0368246883"/>
+                              <Position X="0.196060285" Y="0.705655158" Z="0.0279245265"/>
-                              <Orientation X="-1.39242768" Y="-0.0973874852" Z="0.332219452"/>
+                              <Orientation X="-1.3924278" Y="-0.0973875448" Z="0.332219273"/>
                             </c:Transform>
                           </Components>
                           <Children/>
@@ -2876,7 +2920,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>SniperPoseF</AnimationName>
-                              <Time>0.46481457096376388</Time>
+                              <Time>1.5648641535752326</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -2892,8 +2936,8 @@
                               <Resource>Models/Weapons/Red/SecondaryWeaponRed.mesh</Resource>
                             </c:Model>
                             <c:Transform>
-                              <Position X="-0.0454485677" Y="1.06916106" Z="-0.125484571"/>
+                              <Position X="-0.0454485565" Y="1.06404948" Z="-0.12548466"/>
-                              <Orientation X="-1.50533819" Y="1.34000111" Z="-1.3472451"/>
+                              <Orientation X="-1.5053376" Y="1.34000039" Z="-1.34724426"/>
                             </c:Transform>
                           </Components>
                           <Children/>

resources/Schema/Entities/PlayerAssaultAnimationDemo.xml

@@ -0,0 +1,868 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="PlayerAssault" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AABB>
+      <Origin X="0" Y="0.772000015" Z="0"/>
+      <Size X="1" Y="1.60000002" Z="1"/>
+    </c:AABB>
+    <c:AssaultWeapon/>
+    <c:Team>
+      <Team>
+        <Blue/>
+      </Team>
+    </c:Team>
+    <c:Collidable/>
+    <c:DashAbility/>
+    <c:DoubleJump/>
+    <c:SidearmWeapon>
+      <BaseDamage>10</BaseDamage>
+    </c:SidearmWeapon>
+    <c:Health/>
+    <c:NetworkComponent/>
+    <c:Physics>
+      <Velocity X="2.30999646e-23" Y="0" Z="1.05272533e-23"/>
+    </c:Physics>
+    <c:Player>
+      <MovementSpeed>5</MovementSpeed>
+      <CurrentWeapon></CurrentWeapon>
+    </c:Player>
+    <c:Transform>
+      <Position X="-0.5" Y="0" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="PlayerModel">
+      <Components>
+        <c:BlendOverride>
+          <Master>BlendTreeUpper</Master>
+          <Slave>BlendTreeLower</Slave>
+        </c:BlendOverride>
+        <c:Shielded/>
+        <c:HiddenForLocalPlayer/>
+        <c:Model>
+          <GlowIntensity>2.2000000476837158</GlowIntensity>
+          <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Orientation X="0" Y="0.467000008" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="PrimaryAttachment">
+          <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.159274966" Y="1.03443384" Z="-0.235393077"/>
+              <Orientation X="-0.0276949964" Y="-0.0416635424" Z="0.131935105"/>
+            </c:Transform>
+            <c:WeaponAttachment>
+              <Weapon>AssaultWeapon</Weapon>
+              <Person>
+                <ThirdPerson/>
+              </Person>
+            </c:WeaponAttachment>
+          </Components>
+          <Children>
+            <Entity name="AssaultWeapon">
+              <Components>
+                <c:Shielded/>
+                <c:Model>
+                  <GlowIntensity>1.5</GlowIntensity>
+                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+                </c:Model>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="ReloadSpawner">
+                  <Components>
+                    <c:Spawner>
+                      <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
+                    </c:Spawner>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Muzzle">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0.00728808995" Y="0.0896582007" Z="-0.643795013"/>
+                      <Orientation X="6.27600002" Y="0.00499999989" Z="0.00600000005"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="WeaponMuzzleFlash">
+                      <Components>
+                        <c:Spawner>
+                          <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
+                        </c:Spawner>
+                        <c:Transform>
+                          <Position X="-8.41593719e-05" Y="-0.000816107844" Z="0.0612007342"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="WeaponMuzzleRay">
+                      <Components>
+                        <c:Spawner>
+                          <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
+                        </c:Spawner>
+                        <c:Transform>
+                          <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="SecondaryAttachment">
+          <Components>
+            <c:BoneAttachment>
+              <BoneName>R_Arm_Weapon_Joint</BoneName>
+            </c:BoneAttachment>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.159274966" Y="1.03443384" Z="-0.235393077"/>
+              <Orientation X="-0.0276949964" Y="-0.0416635424" Z="0.131935105"/>
+            </c:Transform>
+            <c:WeaponAttachment>
+              <Weapon>SidearmWeapon</Weapon>
+              <Person>
+                <ThirdPerson/>
+              </Person>
+            </c:WeaponAttachment>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="BlendTreeLower">
+          <Components>
+            <c:Blend>
+              <Pose1>MovementBlend</Pose1>
+              <Pose2>JumpDashBlend</Pose2>
+              <Weight>2.5146881298480398e-63</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="MovementBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>StandMovement</Pose1>
+                  <Pose2>CrouchMovement</Pose2>
+                  <Weight>0</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="CrouchMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DirectionBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DirectionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Walk</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>0</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="StrafeLRBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Left</Pose1>
+                              <Pose2>Right</Pose2>
+                              <Weight>0.033793529385008014</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Left">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeLeftF</AnimationName>
+                                  <Time>0.44988618375479206</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>CrouchStrafeRightF</AnimationName>
+                                  <Time>0.37720764570557463</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="Walk">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>CrouchWalkF</AnimationName>
+                              <Time>0.15558163088297761</Time>
+                              <Play>true</Play>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>CrouchF</AnimationName>
+                          <Time>1.8288091278296688</Time>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="StandMovement">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DirectionBlend</Pose1>
+                      <Pose2>Idle</Pose2>
+                      <Weight>1</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DirectionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>RunWalkBlend</Pose1>
+                          <Pose2>StrafeLRBlend</Pose2>
+                          <Weight>2.4565650245976452e-16</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="RunWalkBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Walk</Pose1>
+                              <Pose2>Run</Pose2>
+                              <Weight>1.2938206818383024e-24</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Walk">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>WalkF</AnimationName>
+                                  <Time>0.84192543677924192</Time>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Run">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>RunF</AnimationName>
+                                  <Time>0.28035050282109175</Time>
+                                  <Speed>2</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                        <Entity name="StrafeLRBlend">
+                          <Components>
+                            <c:Blend>
+                              <Pose1>Left</Pose1>
+                              <Pose2>Right</Pose2>
+                              <Weight>0.033793529385008014</Weight>
+                            </c:Blend>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity name="Left">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeLeftF</AnimationName>
+                                  <Time>0.88305913822256876</Time>
+                                  <Speed>2</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                            <Entity name="Right">
+                              <Components>
+                                <c:Animation>
+                                  <AnimationName>StrafeRightF</AnimationName>
+                                  <Time>0.96047014705853506</Time>
+                                  <Speed>2</Speed>
+                                  <Play>true</Play>
+                                </c:Animation>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="Idle">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleF</AnimationName>
+                          <Time>1.7574641124802284</Time>
+                          <Play>true</Play>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="JumpDashBlend">
+              <Components>
+                <c:Blend>
+                  <Pose1>Jump</Pose1>
+                  <Pose2>DashBlend</Pose2>
+                  <Weight>1</Weight>
+                  <SubTreeRoot>true</SubTreeRoot>
+                </c:Blend>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Jump">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>JumpF</AnimationName>
+                      <Time>0.5</Time>
+                      <Loop>false</Loop>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="DashBlend">
+                  <Components>
+                    <c:Blend>
+                      <Pose1>DashFBBlend</Pose1>
+                      <Pose2>DashLRBlend</Pose2>
+                      <Weight>0.014621149736541383</Weight>
+                    </c:Blend>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="DashFBBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>DashForward</Pose1>
+                          <Pose2>DashBackward</Pose2>
+                          <Weight>0.014363533804961248</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="DashForward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashForwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1.7999999523162842</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashBackward">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashBackwardF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1.7999999523162842</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="DashLRBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>DashLeft</Pose1>
+                          <Pose2>DashRight</Pose2>
+                          <Weight>4.3244885367500671e-16</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="DashLeft">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashLeftF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1.7999999523162842</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="DashRight">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>DashRightF</AnimationName>
+                              <Time>1</Time>
+                              <Speed>1.7999999523162842</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="BlendTreeUpper">
+          <Components>
+            <c:Blend>
+              <Pose1>AssaultWeapon</Pose1>
+              <Pose2>SidearmWeapon</Pose2>
+              <Weight>0</Weight>
+              <SubTreeRoot>true</SubTreeRoot>
+            </c:Blend>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="AssaultWeapon">
+              <Components>
+                <c:BlendAdditive>
+                  <Adder>Aim</Adder>
+                  <Receiver>WeaponBlend</Receiver>
+                </c:BlendAdditive>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponBlend">
+                  <Components>
+                    <c:BlendAdditive>
+                      <Adder>IdleAssault</Adder>
+                      <Receiver>ActionBlend</Receiver>
+                    </c:BlendAdditive>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ActionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Fire</Pose1>
+                          <Pose2>Reload</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Reload">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ReloadSwitchU</AnimationName>
+                              <Speed>0.5</Speed>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Fire">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ShootFastRifleU</AnimationName>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="IdleAssault">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleAssaultRifleU</AnimationName>
+                          <Time>1.4730651229275153</Time>
+                          <Play>true</Play>
+                          <Additive>true</Additive>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Aim">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimRifleA</AnimationName>
+                      <Time>0.5</Time>
+                      <Speed>0.10000000149011612</Speed>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="SidearmWeapon">
+              <Components>
+                <c:BlendAdditive>
+                  <Adder>Aim</Adder>
+                  <Receiver>WeaponBlend</Receiver>
+                </c:BlendAdditive>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="WeaponBlend">
+                  <Components>
+                    <c:BlendAdditive>
+                      <Adder>IdleSidearm</Adder>
+                      <Receiver>ActionBlend</Receiver>
+                    </c:BlendAdditive>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity name="ActionBlend">
+                      <Components>
+                        <c:Blend>
+                          <Pose1>Reload</Pose1>
+                          <Pose2>Fire</Pose2>
+                          <Weight>1</Weight>
+                        </c:Blend>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity name="Reload">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ReloadSwitchU</AnimationName>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                        <Entity name="Fire">
+                          <Components>
+                            <c:Animation>
+                              <AnimationName>ShootSecWepU</AnimationName>
+                              <Loop>false</Loop>
+                            </c:Animation>
+                            <c:Transform/>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                    <Entity name="IdleSidearm">
+                      <Components>
+                        <c:Animation>
+                          <AnimationName>IdleSecWepU</AnimationName>
+                          <Additive>true</Additive>
+                        </c:Animation>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+                <Entity name="Aim">
+                  <Components>
+                    <c:Animation>
+                      <AnimationName>AimSecWepA</AnimationName>
+                      <Time>0.5</Time>
+                      <Loop>false</Loop>
+                      <Additive>true</Additive>
+                    </c:Animation>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+        <Entity name="Lights">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Elbow_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.0641395152" Y="0.971834779" Z="-0.393912911"/>
+                  <Orientation X="-2.71834111" Y="-1.16788483" Z="-2.30780911"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.119805202" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0430894755" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Elbow_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.311632752" Y="1.00616109" Z="-0.0154332817"/>
+                  <Orientation X="1.7501713" Y="1.40668344" Z="0.63290441"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.119999997" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0430000015" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Head">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>Head</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.0810014606" Y="1.25193644" Z="-0.150023431"/>
+                  <Orientation X="-0.278524429" Y="-0.110433489" Z="-0.180452675"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Left">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.117407471" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Right">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.116999999" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_top_left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Top</BoneName>
+                  <PositionOffset X="-0.116000004" Y="0.0500000007" Z="0.0360000022"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-0.188116193" Y="0.722146571" Z="0.020738611"/>
+                  <Orientation X="0.68511039" Y="-0.00414709467" Z="-0.0733199194"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_top_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Top</BoneName>
+                  <PositionOffset X="0.0800000057" Y="0.0730000064" Z="0.064000003"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.149692252" Y="0.745154798" Z="0.0894331336"/>
+                  <Orientation X="-0.00521934591" Y="-0.594766259" Z="0.242353484"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_bottom_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Bottomdw</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.121549807" Y="0.396206558" Z="-0.258821368"/>
+                  <Orientation X="0.0123701356" Y="0.0872921124" Z="-0.0923962742"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_bottom_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Bottom</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.184227288" Y="0.324282408" Z="0.0380233303"/>
+                  <Orientation X="-0.709708989" Y="-0.647283316" Z="0.337633669"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>

resources/Schema/Entities/PlayerAssaultBlue.xml

@@ -572,6 +572,7 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
+          <GlowIntensity>2.2000000476837158</GlowIntensity>
           <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
         </c:Model>
         <c:Transform/>
@@ -586,8 +587,8 @@
               <EntityFile>Schema/Entities/WeaponAssaultBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.128669813" Y="1.08486295" Z="-0.361068189"/>
+              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
-              <Orientation X="-0.0353792347" Y="-0.0854677409" Z="0.133094937"/>
+              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>AssaultWeapon</Weapon>
@@ -607,8 +608,8 @@
               <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.128669813" Y="1.08486295" Z="-0.361068189"/>
+              <Position X="0.165036291" Y="1.03316653" Z="-0.230842277"/>
-              <Orientation X="-0.0353792347" Y="-0.0854677409" Z="0.133094937"/>
+              <Orientation X="-0.0310075935" Y="-0.0666775182" Z="0.132169068"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>SidearmWeapon</Weapon>
@@ -675,7 +676,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                  <Time>0.14513013667773755</Time>
+                                  <Time>0.47961568648540975</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -686,7 +687,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.072451598628520131</Time>
+                                  <Time>0.40693714843619233</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -699,7 +700,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.8508255838059231</Time>
+                              <Time>0.1853111336135953</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -712,7 +713,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>CrouchF</AnimationName>
-                          <Time>1.5240530807526143</Time>
+                          <Time>1.8585386305602865</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -755,7 +756,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                  <Time>0.35598021321569639</Time>
+                                  <Time>0.87165493950985962</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -766,7 +767,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                  <Time>0.3084600556940007</Time>
+                                  <Time>0.33980950828232714</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -790,7 +791,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.91116869109547771</Time>
+                                  <Time>0.94251814368380415</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -802,7 +803,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.98857969993144401</Time>
+                                  <Time>0.019929152519770454</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -818,7 +819,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                          <Time>0.85485929533452953</Time>
+                          <Time>0.55386718012173475</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -944,7 +945,7 @@
             <c:Blend>
               <Pose1>AssaultWeapon</Pose1>
               <Pose2>SidearmWeapon</Pose2>
-              <Weight>1</Weight>
+              <Weight>0</Weight>
               <SubTreeRoot>true</SubTreeRoot>
             </c:Blend>
             <c:Transform/>
@@ -1005,7 +1006,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleAssaultRifleU</AnimationName>
-                          <Time>1.9871198993639698</Time>
+                          <Time>1.502794625658133</Time>
                           <Play>true</Play>
                           <Additive>true</Additive>
                         </c:Animation>
@@ -1108,6 +1109,232 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="Lights">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Elbow_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.0546795987" Y="0.970895708" Z="-0.395071507"/>
+                  <Orientation X="-2.67347836" Y="-1.14967656" Z="-2.35179591"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.119805202" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0430894755" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Elbow_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.311819345" Y="1.00506735" Z="-0.00708915293"/>
+                  <Orientation X="1.66802835" Y="1.3856616" Z="0.553554595"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.119999997" Y="0.0187246669" Z="-0.0205985513"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0430000015" Y="-0.0822322816" Z="0.0446314402"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Head">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>Head</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.0847049356" Y="1.25094736" Z="-0.146904141"/>
+                  <Orientation X="-0.270355761" Y="-0.134028792" Z="-0.181556195"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Left">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.117407471" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Right">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.116999999" Y="0.0664995536" Z="-0.00829757564"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_top_left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Top</BoneName>
+                  <PositionOffset X="-0.116000004" Y="0.0500000007" Z="0.0360000022"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-0.187708378" Y="0.720764816" Z="0.0189282075"/>
+                  <Orientation X="0.690089703" Y="-0.0030452935" Z="-0.0742322952"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_top_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Top</BoneName>
+                  <PositionOffset X="0.0800000057" Y="0.0730000064" Z="0.064000003"/>
+                </c:BoneAttachment>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.784313738" R="0"/>
+                  <Intensity>0.10000000149011612</Intensity>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.149033397" Y="0.743774891" Z="0.0911710933"/>
+                  <Orientation X="0.00418904377" Y="-0.590482414" Z="0.240698725"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Leg_bottom_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Bottomdw</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.121549807" Y="0.396206558" Z="-0.258821368"/>
+                  <Orientation X="0.0123701356" Y="0.0872921124" Z="-0.0923962742"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_bottom_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Bottom</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.184887171" Y="0.323244393" Z="0.0367886424"/>
+                  <Orientation X="-0.714135528" Y="-0.644820809" Z="0.337111086"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0752567574" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.075000003" Y="-0.0357234403" Z="0.0396512263"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="AABBStanding">

resources/Schema/Entities/PlayerDefenderBlue.xml

@@ -579,6 +579,7 @@
         <c:Shielded/>
         <c:HiddenForLocalPlayer/>
         <c:Model>
+          <GlowIntensity>2.2000000476837158</GlowIntensity>
           <Resource>Models/Characters/Defender/DefenderBlue.mesh</Resource>
         </c:Model>
         <c:Transform/>
@@ -593,8 +594,8 @@
               <EntityFile>Schema/Entities/WeaponDefenderBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.160437703" Y="1.04422736" Z="-0.295565188"/>
+              <Position X="0.150445178" Y="1.04946244" Z="-0.300744236"/>
-              <Orientation X="-0.105441377" Y="-0.0721141845" Z="0.143959135"/>
+              <Orientation X="-0.100557618" Y="-0.0389867723" Z="0.143711939"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>DefenderWeapon</Weapon>
@@ -614,8 +615,8 @@
               <EntityFile>Schema/Entities/SidearmWeaponBlueWorld.xml</EntityFile>
             </c:Spawner>
             <c:Transform>
-              <Position X="0.160437703" Y="1.04422736" Z="-0.295565188"/>
+              <Position X="0.150445178" Y="1.04946244" Z="-0.300744236"/>
-              <Orientation X="-0.105441377" Y="-0.0721141845" Z="0.143959135"/>
+              <Orientation X="-0.100557618" Y="-0.0389867723" Z="0.143711939"/>
             </c:Transform>
             <c:WeaponAttachment>
               <Weapon>SidearmWeapon</Weapon>
@@ -682,7 +683,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeLeftF</AnimationName>
-                                  <Time>0.89884525886057709</Time>
+                                  <Time>0.75511438140459752</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -693,7 +694,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>CrouchStrafeRightF</AnimationName>
-                                  <Time>0.82616672081135967</Time>
+                                  <Time>0.6824358433553801</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -706,7 +707,7 @@
                           <Components>
                             <c:Animation>
                               <AnimationName>CrouchWalkF</AnimationName>
-                              <Time>0.60454070598876264</Time>
+                              <Time>0.46080982853278307</Time>
                               <Play>true</Play>
                             </c:Animation>
                             <c:Transform/>
@@ -719,7 +720,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>CrouchF</AnimationName>
-                          <Time>0.27776820293545335</Time>
+                          <Time>1.1340373254794738</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -762,7 +763,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>WalkF</AnimationName>
-                                  <Time>0.10969533539853593</Time>
+                                  <Time>0.080924354358268502</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -773,7 +774,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>RunF</AnimationName>
-                                  <Time>0.81589030005967977</Time>
+                                  <Time>0.75834833797914492</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -797,7 +798,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeLeftF</AnimationName>
-                                  <Time>0.41859893546115678</Time>
+                                  <Time>0.36105697338062193</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -809,7 +810,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>StrafeRightF</AnimationName>
-                                  <Time>0.49600994429712308</Time>
+                                  <Time>0.43846798221658823</Time>
                                   <Speed>2</Speed>
                                   <Play>true</Play>
                                 </c:Animation>
@@ -825,7 +826,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleF</AnimationName>
-                          <Time>1.1919024261691025</Time>
+                          <Time>0.29646465130559285</Time>
                           <Play>true</Play>
                         </c:Animation>
                         <c:Transform/>
@@ -914,7 +915,7 @@
                               <Components>
                                 <c:Animation>
                                   <AnimationName>ShieldFrontU</AnimationName>
-                                  <Time>0.41969766243472861</Time>
+                                  <Time>0.39092668139446118</Time>
                                   <Play>true</Play>
                                 </c:Animation>
                                 <c:Transform/>
@@ -963,7 +964,7 @@
                       <Components>
                         <c:Animation>
                           <AnimationName>IdleAssaultRifleU</AnimationName>
-                          <Time>0.74083502154680936</Time>
+                          <Time>1.7120640405065419</Time>
                           <Play>true</Play>
                           <Additive>true</Additive>
                         </c:Animation>
@@ -1064,6 +1065,287 @@
             </Entity>
           </Children>
         </Entity>
+        <Entity name="Lights">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="Head">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>Head</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.0811523944" Y="1.25871587" Z="-0.135778293"/>
+                  <Orientation X="-0.242026433" Y="-0.103642859" Z="-0.186734527"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Left">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Radius>0.5</Radius>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0938162878" Y="0.0610048659" Z="-0.00614821212"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Right">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Radius>0.5</Radius>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0939999968" Y="0.0610048659" Z="-0.00614821212"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Back">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.00160108448" Y="0.112655103" Z="0.116904415"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Armor_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Shoulder_Armor_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.0336125046" Y="1.14461756" Z="-0.198084712"/>
+                  <Orientation X="-0.123359792" Y="-1.02261281" Z="-0.192506254"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="light">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.259081453" Y="0.0924699008" Z="0.0193806943"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Armor_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Shoulder_Armor_Joint</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.124662042" Y="1.18803668" Z="0.0253864676"/>
+                  <Orientation X="-0.350490361" Y="-0.987647295" Z="0.0760278776"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="light">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.259000003" Y="0.0924699008" Z="0.0193806943"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Elbow_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.0963651165" Y="0.979782283" Z="-0.387918979"/>
+                  <Orientation X="-2.3728857" Y="-0.868270874" Z="-2.74759817"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0530259758" Y="0.0710293874" Z="-0.0176120717"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0404068455" Y="-0.0798887387" Z="-0.000667487504"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Elbow_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Elbow</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.308187783" Y="1.08455598" Z="-0.083610706"/>
+                  <Orientation X="1.80888307" Y="1.43675375" Z="1.20322716"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Upper">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0529999994" Y="0.0710293874" Z="-0.0176120717"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Lower">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="0.701960802" G="0" R="0.188235298"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.0399999991" Y="-0.0798887387" Z="-0.000667487504"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Chest">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>Spine_3</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.0399524719" Y="1.09024417" Z="-0.0680764914"/>
+                  <Orientation X="-0.50802201" Y="-0.93734026" Z="0.267742336"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Back">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.20000000298023224</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0" Y="0.0223282184" Z="0.16728729"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_Bottom_Left">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>L_Leg_Bottom</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="-0.121582747" Y="0.396609098" Z="-0.250624388"/>
+                  <Orientation X="0.0343631394" Y="0.0808496028" Z="-0.090051204"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.09705697" Y="-0.0529966503" Z="0.026842406"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0758597851" Y="-0.0458693244" Z="0.0236873701"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+            <Entity name="Leg_Bottom_Right">
+              <Components>
+                <c:BoneAttachment>
+                  <BoneName>R_Leg_Bottom</BoneName>
+                </c:BoneAttachment>
+                <c:Transform>
+                  <Position X="0.183104694" Y="0.325414658" Z="0.0393271334"/>
+                  <Orientation X="-0.702914894" Y="-0.64635247" Z="0.335363626"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="Inside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="-0.09705697" Y="-0.0529966503" Z="0.026842406"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="Outside">
+                  <Components>
+                    <c:PointLight>
+                      <Color A="1" B="1" G="0.784313738" R="0"/>
+                      <Intensity>0.10000000149011612</Intensity>
+                    </c:PointLight>
+                    <c:Transform>
+                      <Position X="0.0758597851" Y="-0.0458693244" Z="0.0236873701"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
       </Children>
     </Entity>
     <Entity name="AABBStanding">

resources/Schema/Entities/RayAssaultBlue.xml

@@ -5,6 +5,7 @@
     <c:Lifetime>
       <Lifetime>0.079999998211860657</Lifetime>
     </c:Lifetime>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
@@ -17,10 +18,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
           <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>
@@ -35,10 +34,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
           <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>

resources/Schema/Entities/RayDefenderBlue.xml

@@ -5,6 +5,7 @@
     <c:Lifetime>
       <Lifetime>0.079999998211860657</Lifetime>
     </c:Lifetime>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
@@ -17,12 +18,10 @@
           <DiffuseTexture>Textures/Effects/NewRay7.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
-          <Scale X="1" Y="0.0700000003" Z="0"/>
+          <Scale X="1" Y="0.0700000003" Z="1"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -35,12 +34,10 @@
           <DiffuseTexture>Textures/Effects/NewRay7.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
-          <Scale X="1" Y="0.0700000003" Z="0"/>
+          <Scale X="1" Y="0.0700000003" Z="1"/>
         </c:Transform>
       </Components>
       <Children/>

resources/Schema/Entities/RaySideArmBlue.xml

@@ -3,11 +3,12 @@
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.08</Lifetime>
+      <Lifetime>0.080000000000000002</Lifetime>
     </c:Lifetime>
     <c:Fade>
-      <FadeTime>0.08</FadeTime>
+      <FadeTime>0.080000000000000002</FadeTime>
     </c:Fade>
+    <c:NetworkComponent/>
     <c:Transform/>
   </Components>
 
@@ -20,10 +21,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
           <Scale X="1" Y="0.0250000004" Z="0"/>
         </c:Transform>
@@ -38,10 +37,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
           <Scale X="1" Y="0.0250000004" Z="0"/>
         </c:Transform>

resources/Schema/Entities/ReloadEffectWorld.xml

@@ -6,12 +6,14 @@
       <Lifetime>2</Lifetime>
     </c:Lifetime>
     <c:ExplosionEffect>
-      <ColorByDistance>true</ColorByDistance>
+      <Velocity X="1.78000009" Y="0.0320000015" Z="0"/>
-      <Velocity X="1.63300014" Y="0.0320000015" Z="0"/>
+      <ExplosionOrigin X="0" Y="0.142000005" Z="-0.659000039"/>
-      <ExplosionOrigin X="0" Y="0.0790000036" Z="-0.329000026"/>
+      <EndColor A="0" B="19.6078434" G="0.00392156886" R="1.96078432"/>
-      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <RandomnessScalar>1.3399996757507324</RandomnessScalar>
-      <EndColor A="0" B="19.6078434" G="19.6078434" R="0"/>
       <Randomness>true</Randomness>
+      <ColorByDistance>true</ColorByDistance>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <ColorDistanceScalar>5.0899982452392578</ColorDistanceScalar>
     </c:ExplosionEffect>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>

resources/Schema/Entities/Resolution_Options.xml

@@ -18,8 +18,8 @@
           <Color A="1" B="0.117647059" G="0.117647059" R="0.117647059"/>
         </c:Sprite>
         <c:Transform>
-          <Position X="-0.00700000022" Y="-0.0310000014" Z="-0.0270000007"/>
+          <Position X="-0.00200000009" Y="-0.0730000064" Z="-0.0270000007"/>
-          <Scale X="0.292000026" Y="0.064000003" Z="1"/>
+          <Scale X="0.268000007" Y="0.102000006" Z="1"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -40,8 +40,8 @@
           <Color A="0.392156869" B="1" G="1" R="1"/>
         </c:Sprite>
         <c:Transform>
-          <Position X="-0.088000007" Y="-0.0350000001" Z="0"/>
+          <Position X="0.00300000003" Y="-0.0460000038" Z="0"/>
-          <Scale X="0.0820000023" Y="0.0299999993" Z="1"/>
+          <Scale X="0.243000016" Y="0.0260000005" Z="1"/>
         </c:Transform>
       </Components>
       <Children>
@@ -56,8 +56,8 @@
               </Alignment>
             </c:Text>
             <c:Transform>
-              <Position X="-0.361000031" Y="-0.562000036" Z="0.0199999996"/>
+              <Position X="-0.430000007" Y="-0.434000015" Z="0.0199999996"/>
-              <Scale X="0.180000007" Y="0.469000012" Z="1"/>
+              <Scale X="0.0659999996" Y="0.424000025" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -80,8 +80,8 @@
           <Color A="0.392156869" B="1" G="1" R="1"/>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="-0.0350000001" Z="0"/>
+          <Position X="0.00300000003" Y="-0.076000005" Z="0"/>
-          <Scale X="0.0820000023" Y="0.0299999993" Z="1"/>
+          <Scale X="0.243000016" Y="0.0260000005" Z="1"/>
         </c:Transform>
       </Components>
       <Children>
@@ -96,8 +96,8 @@
               </Alignment>
             </c:Text>
             <c:Transform>
-              <Position X="-0.380000025" Y="-0.561999977" Z="0.0199999996"/>
+              <Position X="-0.430000007" Y="-0.434000015" Z="0.0199999996"/>
-              <Scale X="0.180000007" Y="0.469000012" Z="1"/>
+              <Scale X="0.0659999996" Y="0.424000025" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>
@@ -120,8 +120,8 @@
           <Color A="0.392156869" B="1" G="1" R="1"/>
         </c:Sprite>
         <c:Transform>
-          <Position X="0.088000007" Y="-0.0350000001" Z="0"/>
+          <Position X="0.00300000003" Y="-0.107000008" Z="0"/>
-          <Scale X="0.0820000023" Y="0.0299999993" Z="1"/>
+          <Scale X="0.243000016" Y="0.0260000005" Z="1"/>
         </c:Transform>
       </Components>
       <Children>
@@ -136,8 +136,8 @@
               </Alignment>
             </c:Text>
             <c:Transform>
-              <Position X="-0.387000024" Y="-0.561999977" Z="0.0199999996"/>
+              <Position X="-0.430000007" Y="-0.434000015" Z="0.0199999996"/>
-              <Scale X="0.180000007" Y="0.469000012" Z="1"/>
+              <Scale X="0.0659999996" Y="0.424000025" Z="1"/>
             </c:Transform>
           </Components>
           <Children/>

resources/Schema/Entities/ScoreBoard_Main.xml

@@ -18,7 +18,126 @@
           <Position X="-16.5" Y="0" Z="0"/>
         </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="ScoreBoard_Red_Origin">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="RedSide">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="1" B="0" G="0.0862745121" R="1"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.5"/>
+                  <Scale X="32" Y="23" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ScoreBoard_Red">
+              <Components>
+                <c:Team>
+                  <Team>
+                    <Red/>
+                  </Team>
+                </c:Team>
+                <c:ScoreScreen>
+                  <Offset X="0" Y="-3" Z="0"/>
+                </c:ScoreScreen>
+                <c:Transform>
+                  <Position X="0" Y="7" Z="1.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="IDText">
+                  <Components>
+                    <c:Text>
+                      <Content>ID</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="-13" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="NameText">
+                  <Components>
+                    <c:Text>
+                      <Content>Name</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="-10" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="KDText">
+                  <Components>
+                    <c:Text>
+                      <Content>KD</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="1.28838646" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="KillsText">
+                  <Components>
+                    <c:Text>
+                      <Content>Kills</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="4.6874299" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="DeathsText">
+                  <Components>
+                    <c:Text>
+                      <Content>Deaths</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="8.9577198" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
     </Entity>
     <Entity name="Background_Main">
       <Components>
@@ -56,7 +175,126 @@
           <Position X="16.5" Y="0" Z="0"/>
         </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="ScoreBoard_Blue_Origin">
+          <Components>
+            <c:Transform/>
+          </Components>
+          <Children>
+            <Entity name="BlueSide">
+              <Components>
+                <c:Model>
+                  <Resource>Models/Core/UnitCube.mesh</Resource>
+                  <Color A="1" B="1" G="0.505882382" R="0"/>
+                  <Visible>false</Visible>
+                </c:Model>
+                <c:Transform>
+                  <Position X="0" Y="0" Z="0.5"/>
+                  <Scale X="32" Y="23" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ScoreBoard_Blue">
+              <Components>
+                <c:Team>
+                  <Team>
+                    <Blue/>
+                  </Team>
+                </c:Team>
+                <c:ScoreScreen>
+                  <Offset X="0" Y="-3" Z="0"/>
+                </c:ScoreScreen>
+                <c:Transform>
+                  <Position X="0" Y="7" Z="1.5"/>
+                </c:Transform>
+              </Components>
+              <Children>
+                <Entity name="IDText">
+                  <Components>
+                    <c:Text>
+                      <Content>ID</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="-13" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="NameText">
+                  <Components>
+                    <c:Text>
+                      <Content>Name</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="-10" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="KDText">
+                  <Components>
+                    <c:Text>
+                      <Content>KD</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="1.28838646" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="KillsText">
+                  <Components>
+                    <c:Text>
+                      <Content>Kills</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="4.6874299" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="DeathsText">
+                  <Components>
+                    <c:Text>
+                      <Content>Deaths</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Alignment>
+                        <Left/>
+                      </Alignment>
+                    </c:Text>
+                    <c:Transform>
+                      <Position X="8.9577198" Y="2.5" Z="0"/>
+                      <Scale X="2" Y="2" Z="2"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
     </Entity>
     <Entity name="ScoreBoard_Spectators">
       <Components>
@@ -70,6 +308,98 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="EndScreen">
+      <Components>
+        <c:Transform/>
+      </Components>
+      <Children>
+        <Entity name="EndScreen_Origin">
+          <Components>
+            <c:Transform>
+              <Position X="0" Y="3.10000014" Z="42.9360008"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity name="Camera">
+              <Components>
+                <c:Camera/>
+                <c:EndScreen/>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="Sprite_Origin">
+                  <Components>
+                    <c:Transform>
+                      <Position X="0" Y="0.65200001" Z="-1.72800004"/>
+                    </c:Transform>
+                  </Components>
+                  <Children>
+                    <Entity name="SpriteRed">
+                      <Components>
+                        <c:Sprite>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
+                          <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <BlurBackground>true</BlurBackground>
+                          <Color A="0.588235319" B="0" G="0" R="0.588235319"/>
+                          <Visible>false</Visible>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Scale X="1.30000007" Y="0.300000012" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="SpriteBlue">
+                      <Components>
+                        <c:Sprite>
+                          <Model>Models/Core/UnitQuad.mesh</Model>
+                          <GlowMap></GlowMap>
+                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <BlurBackground>true</BlurBackground>
+                          <Color A="0.588235319" B="0.588235319" G="0" R="0"/>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Scale X="1.30000007" Y="0.300000012" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="TextBlue">
+                      <Components>
+                        <c:Text>
+                          <Content>Blue team win!</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                          <Visible>false</Visible>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0670000017" Z="0.0299999993"/>
+                          <Scale X="0.150000006" Y="0.150000006" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                    <Entity name="TextRed">
+                      <Components>
+                        <c:Text>
+                          <Content>Red team win!</Content>
+                          <Resource>Fonts/DroidSans.ttf,64</Resource>
+                        </c:Text>
+                        <c:Transform>
+                          <Position X="0" Y="-0.0670000017" Z="0.0299999993"/>
+                          <Scale X="0.150000006" Y="0.150000006" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/SidearmWeaponBlueWorld.xml

@@ -2,6 +2,7 @@
 <Entity name="SidearmWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:Shielded/>
     <c:Model>
       <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
     </c:Model>
@@ -9,16 +10,37 @@
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
+    <Entity name="Muzzle">
       <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-        </c:Spawner>
         <c:Transform>
-          <Position X="0.0123999491" Y="0.102453232" Z="-0.273824364"/>
+          <Position X="-0.0169804785" Y="-0.0188358482" Z="-0.222064406"/>
         </c:Transform>
       </Components>
-      <Children/>
+      <Children>
+        <Entity name="WeaponMuzzleRay">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0" Y="0.125075191" Z="-0.206788138"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="WeaponMuzzleFlash">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/MuzzleFlashSideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.0240342002" Y="0.116005458" Z="-0.0419839472"/>
+              <Scale X="0.5" Y="0.5" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
     </Entity>
   </Children>
 

resources/Schema/Entities/SidearmWeaponView.xml

@@ -11,17 +11,6 @@
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/Ray2Red.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0" Y="0.105000004" Z="-0.256000012"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="AmmunitionHUD">
       <Components>
         <c:TextFieldReader>
@@ -38,8 +27,9 @@
         <Entity name="AmmunitionHUDBackground">
           <Components>
             <c:Sprite>
-              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
+              <Model>Models/Core/UnitQuad.mesh</Model>
               <GlowMap></GlowMap>
+              <DiffuseTexture>Textures/Core/UnitHexagon.png</DiffuseTexture>
               <Color A="0.588235319" B="0" G="0" R="0"/>
             </c:Sprite>
             <c:Transform>
@@ -56,16 +46,16 @@
           <Children>
             <Entity name="MagazineAmmo">
               <Components>
-                <c:TextFieldReader>
-                  <ParentEntityName>Player</ParentEntityName>
-                  <ComponentType>SidearmWeapon</ComponentType>
-                  <Field>MagazineAmmo</Field>
-                </c:TextFieldReader>
                 <c:Text>
                   <Content>16</Content>
                   <Resource>Fonts/DroidSans.ttf,64</Resource>
                   <Color A="1" B="3.92156863" G="1.17647064" R="0"/>
                 </c:Text>
+                <c:TextFieldReader>
+                  <ParentEntityName>Player</ParentEntityName>
+                  <ComponentType>SidearmWeapon</ComponentType>
+                  <Field>MagazineAmmo</Field>
+                </c:TextFieldReader>
                 <c:Transform>
                   <Position X="0" Y="-0.00600000005" Z="0"/>
                   <Scale X="0.0599999987" Y="0.0599999987" Z="0.0599999987"/>
@@ -92,6 +82,37 @@
         </Entity>
       </Children>
     </Entity>
+    <Entity name="Muzzle">
+      <Components>
+        <c:Transform>
+          <Position X="0.197295129" Y="-0.116625182" Z="-0.709192753"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="WeaponMuzzleRay">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0" Y="0" Z="-0.155046776"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="WeaponMuzzleFlash">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/MuzzleFlashSideArmBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Scale X="0.5" Y="0.5" Z="0.5"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/StartMenu_simple.xml

@@ -34,7 +34,7 @@
               <Axis X="0" Y="1" Z="0"/>
             </c:RaptorCopter>
             <c:Transform>
-              <Orientation X="0" Y="98.9142075" Z="0"/>
+              <Orientation X="0" Y="214.830872" Z="0"/>
             </c:Transform>
           </Components>
           <Children>
@@ -46,7 +46,7 @@
                 </c:RaptorCopter>
                 <c:Transform>
                   <Position X="0" Y="26" Z="40"/>
-                  <Orientation X="0" Y="-114.726761" Z="0"/>
+                  <Orientation X="0" Y="-346.565979" Z="0"/>
                 </c:Transform>
               </Components>
               <Children>
@@ -92,42 +92,6 @@
                                         <c:Transform/>
                                       </Components>
                                       <Children>
-                                        <Entity name="ButtonCorner_Origin">
-                                          <Components>
-                                            <c:Transform/>
-                                          </Components>
-                                          <Children>
-                                            <Entity name="TopRight">
-                                              <Components>
-                                                <c:Sprite>
-                                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                                  <GlowMap></GlowMap>
-                                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                                </c:Sprite>
-                                                <c:Transform>
-                                                  <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
-                                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                                </c:Transform>
-                                              </Components>
-                                              <Children/>
-                                            </Entity>
-                                            <Entity name="BottomRight">
-                                              <Components>
-                                                <c:Sprite>
-                                                  <Model>Models/Core/UnitQuad.mesh</Model>
-                                                  <GlowMap></GlowMap>
-                                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
-                                                </c:Sprite>
-                                                <c:Transform>
-                                                  <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
-                                                  <Orientation X="0" Y="0" Z="4.71199989"/>
-                                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
-                                                </c:Transform>
-                                              </Components>
-                                              <Children/>
-                                            </Entity>
-                                          </Children>
-                                        </Entity>
                                         <Entity name="Button_1">
                                           <Components>
                                             <c:Button/>
@@ -149,6 +113,44 @@
                                           </Components>
                                           <Children/>
                                         </Entity>
+                                        <Entity name="ButtonCorner_Origin">
+                                          <Components>
+                                            <c:Transform/>
+                                          </Components>
+                                          <Children>
+                                            <Entity name="BottomRight">
+                                              <Components>
+                                                <c:Sprite>
+                                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                                  <GlowMap></GlowMap>
+                                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
+                                                </c:Sprite>
+                                                <c:Transform>
+                                                  <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                                                  <Orientation X="0" Y="0" Z="4.71199989"/>
+                                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                                </c:Transform>
+                                              </Components>
+                                              <Children/>
+                                            </Entity>
+                                            <Entity name="TopRight">
+                                              <Components>
+                                                <c:Sprite>
+                                                  <Model>Models/Core/UnitQuad.mesh</Model>
+                                                  <GlowMap></GlowMap>
+                                                  <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
+                                                </c:Sprite>
+                                                <c:Transform>
+                                                  <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                                                  <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                                                </c:Transform>
+                                              </Components>
+                                              <Children/>
+                                            </Entity>
+                                          </Children>
+                                        </Entity>
                                         <Entity name="Text">
                                           <Components>
                                             <c:Text>
@@ -218,6 +220,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
@@ -233,6 +236,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
@@ -263,6 +267,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
@@ -277,6 +282,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
@@ -299,6 +305,10 @@
                                               <BlurBackground>true</BlurBackground>
                                               <Color A="0.392156869" B="0" G="0" R="0"/>
                                             </c:Sprite>
+                                            <c:InputCmdButton>
+                                              <Command>Options</Command>
+                                              <PressValue>1</PressValue>
+                                            </c:InputCmdButton>
                                             <c:Transform>
                                               <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
                                             </c:Transform>
@@ -308,7 +318,7 @@
                                         <Entity name="Text">
                                           <Components>
                                             <c:Text>
-                                              <Content>Option</Content>
+                                              <Content>Options</Content>
                                               <Resource>Fonts/DroidSans.ttf,64</Resource>
                                               <Alignment>
                                                 <Right/>
@@ -374,6 +384,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
@@ -389,6 +400,7 @@
                                                   <Model>Models/Core/UnitQuad.mesh</Model>
                                                   <GlowMap></GlowMap>
                                                   <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                                                  <Linear>false</Linear>
                                                 </c:Sprite>
                                                 <c:Transform>
                                                   <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
@@ -419,12 +431,36 @@
                                       </Components>
                                       <Children/>
                                     </Entity>
+                                    <Entity name="OptionsSpawner">
+                                      <Components>
+                                        <c:Spawner>
+                                          <EntityFile>Schema/Entities/OptionMenu.xml</EntityFile>
+                                        </c:Spawner>
+                                        <c:Transform/>
+                                      </Components>
+                                      <Children/>
+                                    </Entity>
                                   </Children>
                                 </Entity>
                               </Children>
                             </Entity>
                           </Children>
                         </Entity>
+                        <Entity name="TitleSprite">
+                          <Components>
+                            <c:Sprite>
+                              <Model>Models/Core/UnitQuad.mesh</Model>
+                              <GlowMap></GlowMap>
+                              <DiffuseTexture>Textures/Test/SmallDiff.png</DiffuseTexture>
+                              <ClampToBorder>true</ClampToBorder>
+                            </c:Sprite>
+                            <c:Transform>
+                              <Position X="0.0320000015" Y="0.0220000017" Z="-0.0550000034"/>
+                              <Scale X="0.0500000007" Y="0.0150000006" Z="1"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
                       </Children>
                     </Entity>
                   </Children>

resources/Schema/Entities/WeaponAssaultBlueView.xml

@@ -8,6 +8,7 @@
     </c:BlendAdditive>
     <c:Model>
       <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
+      <Shadow>false</Shadow>
     </c:Model>
     <c:Transform/>
   </Components>
@@ -90,9 +91,10 @@
         <c:Model>
           <GlowIntensity>1.5</GlowIntensity>
           <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
-          <Position X="0.120748267" Y="-0.22843127" Z="-0.181454584"/>
+          <Position X="0.120748267" Y="-0.22843127" Z="-0.181454599"/>
           <Orientation X="0.0102799674" Y="-0.00312504289" Z="0.0428140014"/>
         </c:Transform>
       </Components>
@@ -131,7 +133,7 @@
                   <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.00123506912" Y="-0.00209517847" Z="-0.681198895"/>
+                  <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
                 </c:Transform>
               </Components>
               <Children/>

resources/Schema/Entities/WeaponAssaultBlueWorld.xml

@@ -2,6 +2,7 @@
 <Entity name="AssaultWeapon" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:Shielded/>
     <c:Model>
       <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
     </c:Model>
@@ -9,17 +10,6 @@
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
-      <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>
     <Entity name="ReloadSpawner">
       <Components>
         <c:Spawner>
@@ -29,6 +19,38 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="Muzzle">
+      <Components>
+        <c:Transform>
+          <Position X="0.00728808995" Y="0.0896582007" Z="-0.643795013"/>
+          <Orientation X="6.27600002" Y="0.00499999989" Z="0.00600000005"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="WeaponMuzzleFlash">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="-8.41593719e-05" Y="-0.000816107844" Z="0.0612007342"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="WeaponMuzzleRay">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponDefenderBlueView.xml

@@ -8,6 +8,7 @@
     </c:BlendAdditive>
     <c:Model>
       <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+      <Shadow>false</Shadow>
     </c:Model>
     <c:Transform/>
   </Components>
@@ -154,7 +155,7 @@
           <InheritScale>true</InheritScale>
         </c:BoneAttachment>
         <c:Transform>
-          <Position X="0.0540262833" Y="-0.0954347998" Z="-0.225546911"/>
+          <Position X="0.0540262833" Y="-0.0954347998" Z="-0.225546926"/>
           <Orientation X="0.00124507793" Y="0.077417776" Z="0.00737103401"/>
           <Scale X="0.300000012" Y="0.300000042" Z="0.299999952"/>
         </c:Transform>
@@ -244,9 +245,10 @@
             </c:BoneAttachment>
             <c:Model>
               <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
+              <Shadow>false</Shadow>
             </c:Model>
             <c:Transform>
-              <Position X="0.120748043" Y="-0.228436321" Z="-0.151475549"/>
+              <Position X="0.120748043" Y="-0.228436321" Z="-0.151475564"/>
               <Orientation X="0.0102800643" Y="-0.00312487315" Z="0.0428144038"/>
             </c:Transform>
           </Components>
@@ -265,7 +267,7 @@
         <Entity name="Muzzle">
           <Components>
             <c:Transform>
-              <Position X="0.137428522" Y="-0.145251781" Z="-0.590083241"/>
+              <Position X="0.119734153" Y="-0.145251781" Z="-0.564532101"/>
             </c:Transform>
           </Components>
           <Children>
@@ -275,7 +277,7 @@
                   <EntityFile>Schema/Entities/RayDefenderBlue.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.0180841181" Y="0.0252480619" Z="-0.663679719"/>
+                  <Position X="0" Y="0" Z="-0.109966502"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -286,7 +288,7 @@
                   <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.0201820824" Y="0.0212024488" Z="-0.0305794869"/>
+                  <Position X="0.0201820824" Y="0" Z="0"/>
                   <Scale X="1.5" Y="1.5" Z="1"/>
                 </c:Transform>
               </Components>

resources/Schema/Entities/WeaponDefenderBlueWorld.xml

@@ -2,6 +2,7 @@
 <Entity name="ThirdPersonWeaponModel" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
 
   <Components>
+    <c:Shielded/>
     <c:Model>
       <Resource>Models/Weapons/Blue/DefenderWeaponBlue.mesh</Resource>
     </c:Model>
@@ -9,17 +10,6 @@
   </Components>
 
   <Children>
-    <Entity name="WeaponMuzzle">
-      <Components>
-        <c:Spawner>
-          <EntityFile>Schema/Entities/DefenderRayBlue.xml</EntityFile>
-        </c:Spawner>
-        <c:Transform>
-          <Position X="0.000284185546" Y="0.0318552479" Z="-0.193328083"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="ThirdPersonReloadSpawner">
       <Components>
         <c:Spawner>
@@ -29,6 +19,38 @@
       </Components>
       <Children/>
     </Entity>
+    <Entity name="Muzzle">
+      <Components>
+        <c:Transform>
+          <Position X="-0.0100463303" Y="0.0624945536" Z="-0.372351319"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity name="WeaponMuzzleRay">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/RayDefenderBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.0180841181" Y="0.0252480619" Z="-0.135249734"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="WeaponMuzzleFlash">
+          <Components>
+            <c:Spawner>
+              <EntityFile>Schema/Entities/MuzzleFlashBlue.xml</EntityFile>
+            </c:Spawner>
+            <c:Transform>
+              <Position X="0.0201820824" Y="0.0212024488" Z="-0.0305794869"/>
+              <Scale X="1.5" Y="1.5" Z="1"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
   </Children>
 
 </Entity>

resources/Schema/Entities/WeaponSidearmAssaultBlueView.xml

@@ -8,6 +8,7 @@
     </c:BlendAdditive>
     <c:Model>
       <Resource>Models/Characters/Assault/FirstPersonAssaultBlue.mesh</Resource>
+      <Shadow>false</Shadow>
     </c:Model>
     <c:Transform/>
   </Components>
@@ -183,6 +184,7 @@
             <c:Model>
               <GlowIntensity>1.2999999523162842</GlowIntensity>
               <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
+              <Shadow>false</Shadow>
             </c:Model>
             <c:Transform>
               <Position X="0.185786247" Y="-0.21622014" Z="-0.412707269"/>
@@ -204,7 +206,7 @@
         <Entity name="Muzzle">
           <Components>
             <c:Transform>
-              <Position X="0.197295129" Y="-0.116625182" Z="-0.709192753"/>
+              <Position X="0.189540595" Y="-0.114737265" Z="-0.681462705"/>
             </c:Transform>
           </Components>
           <Children>
@@ -213,9 +215,7 @@
                 <c:Spawner>
                   <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
                 </c:Spawner>
-                <c:Transform>
+                <c:Transform/>
-                  <Position X="0" Y="0" Z="-0.155046776"/>
-                </c:Transform>
               </Components>
               <Children/>
             </Entity>

resources/Schema/Entities/WeaponSidearmDefenderBlueView.xml

@@ -8,6 +8,7 @@
     </c:BlendAdditive>
     <c:Model>
       <Resource>Models/Characters/Defender/FirstPersonDefenderBlue.mesh</Resource>
+      <Shadow>false</Shadow>
     </c:Model>
     <c:Transform/>
   </Components>
@@ -86,7 +87,7 @@
           <BoneName>R_Ammo_Joint</BoneName>
         </c:BoneAttachment>
         <c:Transform>
-          <Position X="0.109812573" Y="-0.0832190216" Z="-0.373473197"/>
+          <Position X="0.109812573" Y="-0.0832190216" Z="-0.373473227"/>
           <Orientation X="0.00118373742" Y="0.077411525" Z="0.00458352407"/>
           <Scale X="0.400000006" Y="0.400000006" Z="0.400000006"/>
         </c:Transform>
@@ -183,9 +184,10 @@
             <c:Model>
               <GlowIntensity>1.5</GlowIntensity>
               <Resource>Models/Weapons/Blue/SecondaryWeaponBlue.mesh</Resource>
+              <Shadow>false</Shadow>
             </c:Model>
             <c:Transform>
-              <Position X="0.18578662" Y="-0.216220587" Z="-0.382728696"/>
+              <Position X="0.18578662" Y="-0.216220587" Z="-0.382728726"/>
               <Orientation X="0.010279973" Y="-0.00312555139" Z="0.0428142436"/>
             </c:Transform>
           </Components>
@@ -204,10 +206,19 @@
         <Entity name="Muzzle">
           <Components>
             <c:Transform>
-              <Position X="0.196999997" Y="-0.116999999" Z="-0.668634355"/>
+              <Position X="0.192775041" Y="-0.117133088" Z="-0.647809923"/>
             </c:Transform>
           </Components>
           <Children>
+            <Entity name="WeaponMuzzleRay">
+              <Components>
+                <c:Spawner>
+                  <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
+                </c:Spawner>
+                <c:Transform/>
+              </Components>
+              <Children/>
+            </Entity>
             <Entity name="WeaponMuzzleFlash">
               <Components>
                 <c:Spawner>
@@ -219,17 +230,6 @@
               </Components>
               <Children/>
             </Entity>
-            <Entity name="WeaponMuzzleRay">
-              <Components>
-                <c:Spawner>
-                  <EntityFile>Schema/Entities/RaySideArmBlue.xml</EntityFile>
-                </c:Spawner>
-                <c:Transform>
-                  <Position X="0" Y="0" Z="-0.155000001"/>
-                </c:Transform>
-              </Components>
-              <Children/>
-            </Entity>
           </Children>
         </Entity>
       </Children>

resources/Setup/Inno Setup Script.iss

@@ -0,0 +1,76 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "Axyz"
+#define MyAppVersion "1.0"
+#define MyAppURL "https://github.com/teamfisk/TacticalZ"
+#define MyAppExeName "Axyz.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{38D77EB2-6B56-4B4F-BAAE-43F9E6E1A191}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DisableProgramGroupPage=yes
+OutputBaseFilename=Axyz Setup
+SetupIconFile=..\Axyz.ico
+Compression=lzma2
+SolidCompression=yes
+; "ArchitecturesAllowed=x64" specifies that Setup cannot run on
+; anything but x64.
+ArchitecturesAllowed=x64
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64
+OutputDir=.
+DisableWelcomePage=false
+;WizardSmallImageFile=
+WizardImageFile=Setup Banner.bmp
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "..\..\bin\Audio\*"; DestDir: "{app}\Audio\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Fonts\*"; DestDir: "{app}\Fonts\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Licenses\*"; DestDir: "{app}\Licenses\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Models\*"; DestDir: "{app}\Models\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Schema\*"; DestDir: "{app}\Schema\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Shaders\*"; DestDir: "{app}\Shaders\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\Textures\*"; DestDir: "{app}\Textures\"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\..\bin\assimp.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\DefaultConfig.ini"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\DefaultInput.ini"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\glew32.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\glfw3.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\Axyz.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\xerces-c_3_1.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\bin\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
+
+[Icons]
+Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[INI]
+Filename: "{app}\Config.ini"; Section: "Networking"; Key: "Name"; String: "{%USERNAME}"; Flags: createkeyifdoesntexist
+
+[Run]
+Filename: "{tmp}\VC_redist.x64.exe"; Parameters: "/norestart /passive"; StatusMsg: "Installing Microsoft Visual C++ 2015 x64 Redistributable....";
+
+[ThirdParty]
+UseRelativePaths=True

src/Engine/Editor/EditorSystem.cpp

@@ -8,6 +8,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     : System(params)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
+    , m_CamVelocity(0.f)
 {
     m_EditorWorld = new World();
     m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
@@ -83,14 +84,55 @@ void EditorSystem::Update(double dt)
             }
         }
         m_EditorWorldSystemPipeline->Update(actualDelta);
-
-        ComponentWrapper& cameraTransform = m_EditorCamera["Transform"];
-        Field<glm::vec3> ori = cameraTransform["Orientation"];
-        ori.x(m_EditorCameraInputController->Rotation().x);
-        ori.y(m_EditorCameraInputController->Rotation().y);
-        Field<glm::vec3> pos = cameraTransform["Position"];
-        pos += m_EditorCameraInputController->Movement() * glm::inverse(glm::quat(ori)) * (float)actualDelta;
     }
+
+    ComponentWrapper& cameraTransform = m_EditorCamera["Transform"];
+    Field<glm::vec3> ori = cameraTransform["Orientation"];
+    glm::vec3 newOri;
+    newOri.x = glm::mix(ori.x(), m_EditorCameraInputController->Rotation().x, 0.05f);
+    newOri.y = glm::mix(ori.y(), m_EditorCameraInputController->Rotation().y, 0.05f);
+    //ori.x(m_EditorCameraInputController->Rotation().x);
+    //ori.y(m_EditorCameraInputController->Rotation().y);
+    ori.x(newOri.x);
+    ori.y(newOri.y);
+    Field<glm::vec3> pos = cameraTransform["Position"];
+    auto move = m_EditorCameraInputController->Movement();
+    const float decreaseAccelleration = 3.75f;
+    const float increaseAccelleration = 5.25f;
+    if (move.x == 0) {
+        m_CamVelocity.x -= m_CamVelocity.x * (float)actualDelta * decreaseAccelleration;
+        //m_CamVelocity.x -= glm::sign(m_CamVelocity.x) * (float)actualDelta * decreaseAccelleration;
+        if (glm::abs(m_CamVelocity.x) < 0.01f) {
+            m_CamVelocity.x = 0;
+        }
+    } else {
+        m_CamVelocity.x += glm::sign(move.x) * (float)actualDelta * increaseAccelleration;
+        m_CamVelocity.x = glm::max(m_CamVelocity.x, -glm::abs(move.x));
+        m_CamVelocity.x = glm::min(m_CamVelocity.x, glm::abs(move.x));
+    }
+    if (move.y == 0) {
+        m_CamVelocity.y -= m_CamVelocity.y * (float)actualDelta * decreaseAccelleration;
+        //m_CamVelocity.y -= glm::sign(m_CamVelocity.y) * (float)actualDelta * decreaseAccelleration;
+        if (glm::abs(m_CamVelocity.y) < 0.01f) {
+            m_CamVelocity.y = 0;
+        }
+    } else {
+        m_CamVelocity.y += glm::sign(move.y) * (float)actualDelta * increaseAccelleration;
+        m_CamVelocity.y = glm::max(m_CamVelocity.y, -glm::abs(move.y));
+        m_CamVelocity.y = glm::min(m_CamVelocity.y, glm::abs(move.y));
+    }
+    if (move.z == 0) {
+        m_CamVelocity.z -= m_CamVelocity.z * (float)actualDelta * decreaseAccelleration;
+        //m_CamVelocity.z -= glm::sign(m_CamVelocity.z) * (float)actualDelta * decreaseAccelleration;
+        if (glm::abs(m_CamVelocity.z) < 0.01f) {
+            m_CamVelocity.z = 0;
+        }
+    } else {
+        m_CamVelocity.z += glm::sign(move.z) * (float)actualDelta * increaseAccelleration;
+        m_CamVelocity.z = glm::max(m_CamVelocity.z, -glm::abs(move.z));
+        m_CamVelocity.z = glm::min(m_CamVelocity.z, glm::abs(move.z));
+    }
+    pos += m_CamVelocity * glm::inverse(glm::quat(ori)) * (float)actualDelta;
 }
 
 void EditorSystem::Enable()
@@ -117,11 +159,11 @@ void EditorSystem::Enable()
 
 void EditorSystem::Disable()
 {
-    m_EditorCameraInputController->Disable();
+    //m_EditorCameraInputController->Disable();
     m_EventBroker->Publish(Events::LockMouse());
     Events::SetCamera e;
     e.CameraEntity = m_ActualCamera;
-    m_EventBroker->Publish(e);
+    //m_EventBroker->Publish(e);
     m_Enabled = false;
 }
 

src/Engine/Network/Client.cpp

@@ -176,6 +176,9 @@ void Client::parseMessageType(Packet& packet)
     case MessageType::KD:
         parseKDEvent(packet);
         break;
+    case MessageType::Win:
+        parseWin(packet);
+        break;
     default:
         break;
     }
@@ -376,6 +379,13 @@ void Client::parseKDEvent(Packet & packet)
     m_EventBroker->Publish(e);
 }
 
+void Client::parseWin(Packet& packet)
+{
+    Events::Win e;
+    e.TeamThatWon = packet.ReadPrimitive<int>();
+    m_EventBroker->Publish(e);
+}
+
 void Client::updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID)
 {
     for (auto field : componentInfo.FieldsInOrder) {

src/Engine/Network/Server.cpp

@@ -609,6 +609,9 @@ bool Server::OnWin(const Events::Win & e)
 {
     // Postpone the gameover reset
     m_GameIsOver = true;
+    Packet winPacket = Packet(MessageType::Win);
+    winPacket.WritePrimitive(e.TeamThatWon);
+    reliableBroadcast(winPacket);
     return true;
 }
 

src/Engine/Rendering/AnimationSystem.cpp

@@ -6,6 +6,7 @@ AnimationSystem::AnimationSystem(SystemParams params)
     EVENT_SUBSCRIBE_MEMBER(m_EAutoAnimationBlend, &AnimationSystem::OnAutoAnimationBlend);
     EVENT_SUBSCRIBE_MEMBER(m_EEntityDeleted, &AnimationSystem::OnEntityDeleted);
     EVENT_SUBSCRIBE_MEMBER(m_ESetBlendWeight, &AnimationSystem::OnSetBlendWeight);
+    EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &AnimationSystem::OnInputCommand);
 }
 
 void AnimationSystem::Update(double dt)
@@ -14,6 +15,19 @@ void AnimationSystem::Update(double dt)
     CreateBlendTrees();
     UpdateWeights(dt);
 
+    EntityWrapper aimEntity = m_World->GetFirstEntityByName("ThirdPerson").FirstChildByName("Aim");
+    (Field<double>)aimEntity["Animation"]["Time"] = glm::clamp((const double&)(Field<double>)aimEntity["Animation"]["Time"] + ((aimMove * 0.2f) * dt), 0.0, 1.0);
+
+
+    EntityWrapper aimTextEntity = m_World->GetFirstEntityByName("AimText");
+
+    if (aimMove > 0) {
+        (Field<std::string>)aimTextEntity["Text"]["Content"] = "Up";
+    } else if (aimMove < 0) {
+        (Field<std::string>)aimTextEntity["Text"]["Content"] = "Down";
+    } else {
+        (Field<std::string>)aimTextEntity["Text"]["Content"] = " ";
+    }
 
     for(auto& autoBlendQueue : m_AutoBlendQueues) {
         autoBlendQueue.second.UpdateTime(dt);
@@ -353,3 +367,357 @@ bool AnimationSystem::OnSetBlendWeight(Events::SetBlendWeight& e)
     }
 
 }
+
+bool AnimationSystem::OnInputCommand(Events::InputCommand& e)
+{
+    EntityWrapper firstPerson = m_World->GetFirstEntityByName("FirstPerson");
+    EntityWrapper thirdPerson = m_World->GetFirstEntityByName("ThirdPerson");
+
+    EntityWrapper currentBlend = m_World->GetFirstEntityByName("CurrentBlend");
+    EntityWrapper queuedBlend = m_World->GetFirstEntityByName("QueuedBlend");
+    EntityWrapper MovementText = m_World->GetFirstEntityByName("MovementText");
+    
+    
+    if (e.Command == "ClearText") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = " ";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = " ";
+        }
+    }
+
+    if(e.Command == "Jump") {
+        if(e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Jump";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Movement";
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.2f;
+            blendEvent.NodeName = "Jump";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQueued;
+            blendEventQueued.RootNode = thirdPerson;
+            blendEventQueued.Delay = -0.1;
+            blendEventQueued.Duration = 0.3f;
+            blendEventQueued.NodeName = "MovementBlend";
+            blendEventQueued.AnimationEntity = thirdPerson.FirstChildByName("Jump");
+            m_EventBroker->Publish(blendEventQueued);
+        }
+    }
+
+    if (e.Command == "DashL") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Dash Left";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Movement";
+
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.2f;
+            blendEvent.NodeName = "DashLeft";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQueued;
+            blendEventQueued.RootNode = thirdPerson;
+            blendEventQueued.Delay = -0.1;
+            blendEventQueued.Duration = 0.3f;
+            blendEventQueued.NodeName = "MovementBlend";
+            blendEventQueued.AnimationEntity = thirdPerson.FirstChildByName("DashLeft");
+            m_EventBroker->Publish(blendEventQueued);
+        }
+    }
+
+    if (e.Command == "DashR") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Dash Right";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Movement";
+
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.2f;
+            blendEvent.NodeName = "DashRight";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQueued;
+            blendEventQueued.RootNode = thirdPerson;
+            blendEventQueued.Delay = -0.1;
+            blendEventQueued.Duration = 0.3f;
+            blendEventQueued.NodeName = "MovementBlend";
+            blendEventQueued.AnimationEntity = thirdPerson.FirstChildByName("DashRight");
+            m_EventBroker->Publish(blendEventQueued);
+        }
+    }
+
+    if (e.Command == "DashF") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Dash Forward";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Movement";
+
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.2f;
+            blendEvent.NodeName = "DashForward";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQueued;
+            blendEventQueued.RootNode = thirdPerson;
+            blendEventQueued.Delay = -0.1;
+            blendEventQueued.Duration = 0.3f;
+            blendEventQueued.NodeName = "MovementBlend";
+            blendEventQueued.AnimationEntity = thirdPerson.FirstChildByName("DashForward");
+            m_EventBroker->Publish(blendEventQueued);
+        }
+    }
+
+    if (e.Command == "DashB") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Dash Backward";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Movement";
+
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.2f;
+            blendEvent.NodeName = "DashBackward";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQueued;
+            blendEventQueued.RootNode = thirdPerson;
+            blendEventQueued.Delay = -0.1;
+            blendEventQueued.Duration = 0.3f;
+            blendEventQueued.NodeName = "MovementBlend";
+            blendEventQueued.AnimationEntity = thirdPerson.FirstChildByName("DashBackward");
+            m_EventBroker->Publish(blendEventQueued);
+        }
+    }
+
+
+    if (e.Command == "Right") {
+        if (e.Value > 0) {
+            (Field<std::string>)MovementText["Text"]["Content"] = "Right";
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.3f;
+            blendEvent.NodeName = "Right";
+            blendEvent.Start = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventFP;
+            blendEventFP.RootNode = firstPerson;
+            blendEventFP.Duration = 0.3f;
+            blendEventFP.NodeName = "Run";
+            blendEventFP.Start = true;
+            m_EventBroker->Publish(blendEventFP);
+
+
+        } else if (e.Value < 0) {
+            (Field<std::string>)MovementText["Text"]["Content"] = "Left";
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.3f;
+            blendEvent.NodeName = "Left";
+            blendEvent.Start = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventFP;
+            blendEventFP.RootNode = firstPerson;
+            blendEventFP.Duration = 0.3f;
+            blendEventFP.NodeName = "Run";
+            blendEventFP.Reverse = true;
+            blendEventFP.Start = true;
+            m_EventBroker->Publish(blendEventFP);
+        }
+    }else if (e.Command == "Up") {
+        if (e.Value > 0) {
+            (Field<std::string>)MovementText["Text"]["Content"] = "Forward";
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.3f;
+            if (Crouch) {
+                blendEvent.NodeName = "Walk";
+
+                Events::AutoAnimationBlend blendEventFP;
+                blendEventFP.RootNode = firstPerson;
+                blendEventFP.Duration = 0.3f;
+                blendEventFP.NodeName = "Idle";
+                blendEventFP.Start = true;
+                m_EventBroker->Publish(blendEventFP);
+
+            } else {
+                blendEvent.NodeName = "Run";
+
+
+                Events::AutoAnimationBlend blendEventFP;
+                blendEventFP.RootNode = firstPerson;
+                blendEventFP.Duration = 0.3f;
+                blendEventFP.NodeName = "Run";
+                blendEventFP.Start = true;
+                m_EventBroker->Publish(blendEventFP);
+
+            }
+            blendEvent.Start = true;
+            m_EventBroker->Publish(blendEvent);
+        }else if (e.Value < 0) {
+            (Field<std::string>)MovementText["Text"]["Content"] = "Backward";
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.3f;
+            if(Crouch) {
+                blendEvent.NodeName = "Walk";
+
+                Events::AutoAnimationBlend blendEventFP;
+                blendEventFP.RootNode = firstPerson;
+                blendEventFP.Duration = 0.3f;
+                blendEventFP.NodeName = "Idle";
+                blendEventFP.Start = true;
+                m_EventBroker->Publish(blendEventFP);
+            } else {
+                blendEvent.NodeName = "Run";
+
+                Events::AutoAnimationBlend blendEventFP;
+                blendEventFP.RootNode = firstPerson;
+                blendEventFP.Duration = 0.3f;
+                blendEventFP.NodeName = "Run";
+                blendEventFP.Reverse = true;
+                blendEventFP.Start = true;
+                m_EventBroker->Publish(blendEventFP);
+            }
+            blendEvent.Start = true;
+            blendEvent.Reverse = true;
+            m_EventBroker->Publish(blendEvent);
+        }
+    }
+
+    if (e.Command == "Idle"){
+        if (e.Value > 0) {
+            (Field<std::string>)MovementText["Text"]["Content"] = "Idle";
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.5f;
+            blendEvent.NodeName = "Idle";
+            blendEvent.Start = true;
+            blendEvent.Reverse = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventFP;
+            blendEventFP.RootNode = firstPerson;
+            blendEventFP.Duration = 0.3f;
+            blendEventFP.NodeName = "Idle";
+            blendEventFP.Start = true;
+            m_EventBroker->Publish(blendEventFP);
+        }
+    }
+
+
+    if (e.Command == "Crouch") {
+        if (e.Value > 0) {
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.5f;
+            blendEvent.NodeName = "CrouchMovement";
+            blendEvent.Start = true;
+            blendEvent.Reverse = true;
+            m_EventBroker->Publish(blendEvent);
+            Crouch = true;
+        } else {
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.5f;
+            blendEvent.NodeName = "StandMovement";
+            blendEvent.Start = true;
+            blendEvent.Reverse = true;
+            m_EventBroker->Publish(blendEvent);
+            Crouch = false;
+        }
+    }
+
+    if (e.Command == "Aim") {
+        aimMove = e.Value;
+    } 
+
+    if (e.Command == "Shoot") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Fire";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Idle";
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.1f;
+            blendEvent.NodeName = "Fire";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventFP;
+            blendEventFP.RootNode = firstPerson;
+            blendEventFP.Duration = 0.1f;
+            blendEventFP.NodeName = "Fire";
+            blendEventFP.Start = true;
+            blendEventFP.Restart = true;
+            m_EventBroker->Publish(blendEventFP);
+        }
+    }
+
+
+    if (e.Command == "Reload") {
+        if (e.Value > 0) {
+            (Field<std::string>)currentBlend["Text"]["Content"] = "Reload";
+            (Field<std::string>)queuedBlend["Text"]["Content"] = "Idle";
+
+
+            Events::AutoAnimationBlend blendEvent;
+            blendEvent.RootNode = thirdPerson;
+            blendEvent.Duration = 0.1f;
+            blendEvent.NodeName = "Reload";
+            blendEvent.Start = true;
+            blendEvent.Restart = true;
+            m_EventBroker->Publish(blendEvent);
+
+            Events::AutoAnimationBlend blendEventQ;
+            blendEventQ.RootNode = thirdPerson;
+            blendEventQ.Duration = 0.2f;
+            blendEventQ.Delay = -0.1;
+            blendEventQ.NodeName = "Fire";
+            blendEventQ.Start = false;
+            blendEventQ.Restart = true;
+            blendEventQ.AnimationEntity = thirdPerson.FirstChildByName("Reload");
+            m_EventBroker->Publish(blendEventQ);
+
+
+
+            Events::AutoAnimationBlend blendEventFP;
+            blendEventFP.RootNode = firstPerson;
+            blendEventFP.Duration = 0.1f;
+            blendEventFP.NodeName = "Reload";
+            blendEventFP.Start = true;
+            blendEventFP.Restart = true;
+            m_EventBroker->Publish(blendEventFP);
+
+            Events::AutoAnimationBlend blendEventFPQ;
+            blendEventFPQ.RootNode = firstPerson;
+            blendEventFPQ.Duration = 0.2f;
+            blendEventFPQ.Delay = -0.1;
+            blendEventFPQ.NodeName = "Fire";
+            blendEventFPQ.Start = false;
+            blendEventFPQ.Restart = true;
+            blendEventFPQ.AnimationEntity = thirdPerson.FirstChildByName("Reload");
+            m_EventBroker->Publish(blendEventFPQ);
+
+        }
+    }
+
+    return true;
+}

src/Engine/Rendering/Renderer.cpp

@@ -19,6 +19,7 @@ void Renderer::Initialize()
 {
 	m_SSAO_Quality = m_Config->Get<int>("SSAO.Quality", 0);
 	m_GLOW_Quality = m_Config->Get<int>("GLOW.Quality", 0);
+    m_MSAA_Level = m_Config->Get<unsigned int>("MSAA.Level", 0);
 	InitializeWindow();
     
     InitializeRenderPasses();
@@ -75,7 +76,7 @@ void Renderer::InitializeWindow()
         //glfwWindowHint(GLFW_BLUE_BITS, mode->blueBits);
         //glfwWindowHint(GLFW_REFRESH_RATE, mode->refreshRate);
         glfwWindowHint(GLFW_DECORATED, false);
-        glfwWindowHint(GLFW_AUTO_ICONIFY, false);
+        //glfwWindowHint(GLFW_AUTO_ICONIFY, false);
 	}
 
     //glfwWindowHint(GLFW_SAMPLES, 8);
@@ -167,17 +168,21 @@ void Renderer::Draw(RenderFrame& frame)
 {
     GLERROR("PRE");
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+#ifdef DEBUG
     ImGui::Combo("Draw textures", &m_DebugTextureToDraw, "Final\0Scene\0Bloom\0Gaussian\0Picking\0Ambient Occlusion\0Combined Scene Texture\0Full Blurred Texture");
     ImGui::Combo("CubeMap", &m_CubeMapTexture, "Nevada(512)\0Sky(1024)");
+#endif
     if(m_CubeMapTexture == 0) {
         m_CubeMapPass->LoadTextures("Nevada");
     } else if (m_CubeMapTexture == 1) {
         m_CubeMapPass->LoadTextures("Sky");
     }
 
+#ifdef DEBUG
 	ImGui::SliderInt("SSAO Quality", &m_SSAO_Quality, 0, 3);
 	ImGui::SliderInt("Glow Quality", &m_GLOW_Quality, 0, 3);
 	ImGui::SliderInt("MSAA Level", (int*)&m_MSAA_Level, 0, 16);
+#endif
 	m_SSAOPass->ChangeQuality(m_SSAO_Quality);
 	m_DrawBloomPass->ChangeQuality(m_GLOW_Quality);
 	m_DrawFinalPass->setMSAA(m_MSAA_Level);

src/Engine/Rendering/ShadowPass.cpp

@@ -25,11 +25,13 @@ ShadowPass::~ShadowPass()
 
 void ShadowPass::DebugGUI()
 {
+#ifdef DEBUG
 	ImGui::Checkbox("EnableShadows", &m_EnableShadows);
 	ImGui::DragFloat2("ShadowMapNearFar", m_NearFarPlane, 1.f, -1000.f, 1000.f);
 	ImGui::DragFloat("ShadowClippingWeight", &m_SplitWeight, 0.001f, 0.f, 1.f);
 	ImGui::Checkbox("ShadowTransparentObjects", &m_TransparentObjects);
 	ImGui::Checkbox("ShadowOnTextureAlphas", &m_TexturedShadows);
+#endif
 }
 
 void ShadowPass::InitializeCameras(RenderScene & scene)

src/Engine/Sound/SoundManager.cpp

@@ -417,6 +417,14 @@ bool SoundManager::OnSetCamera(const Events::SetCamera& e)
         alSourcei(m_CurrentBGMCombo->ALsource, AL_LOOPING, 1);
         setGain(m_CurrentBGMCombo, 0);
         playSound(m_CurrentBGMCombo);
+    } else if (m_World->HasComponent(e.CameraEntity.ID, "EndScreen")) {
+        float timeOffset = getTimeOffsetSeconds(m_CurrentBGM);
+        stopSound(m_CurrentBGM);
+        m_CurrentBGM = createSource("Audio/BGM/Layer3.wav");
+        m_CurrentBGM->Type = SoundType::BGM;
+        alSourcei(m_CurrentBGM->ALsource, AL_LOOPING, 1);
+        playSound(m_CurrentBGM);
+        setTimeOffsetSeconds(m_CurrentBGM, timeOffset);
     }
 }
 
@@ -477,6 +485,11 @@ float SoundManager::getTimeOffsetSeconds(Source* source)
     return time;
 }
 
+void SoundManager::setTimeOffsetSeconds(Source * source, float timeOffset)
+{ 
+    alSourcef(source->ALsource, AL_SEC_OFFSET, timeOffset);
+}
+
 void SoundManager::initOpenAL()
 {
     // Initialize OpenAL

src/Game/CMakeLists.txt

@@ -53,10 +53,11 @@ target_link_libraries(Game
     ${LIBRARIES}
 )
 
-add_executable(TacticalZ
+add_executable(Axyz
 	main.cpp
+    ${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc
 )
-target_link_libraries(TacticalZ
+target_link_libraries(Axyz
     Game
     ${LIBRARIES}
 )

src/Game/Systems/FadeSystem.cpp

@@ -24,14 +24,14 @@ void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade,
     currentTime += dTime;
 
     if(currentTime > fadeTime) {
-        currentTime = 0.0;
+        currentTime = 0.0 + fadeTime * (bool)cFade["Loop"];
         if ((bool)cFade["Reverse"]) {
             (Field<bool>)cFade["Out"] = !(bool)cFade["Out"];
             currentTime = fadeTime;
         }
     }
     if(currentTime < 0.0) {
-        currentTime = fadeTime;
+        currentTime = fadeTime * (bool)cFade["Loop"];
         if ((bool)cFade["Reverse"]) {
             (Field<bool>)cFade["Out"] = !(bool)cFade["Out"];
             currentTime = 0.0;

src/Game/Systems/PlayerMovementSystem.cpp

@@ -3,6 +3,7 @@
 PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
     : System(params)
     , m_SprintEffectTimer(0.f)
+    , m_DashEffectTimer(0.f)
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &PlayerMovementSystem::OnDoubleJump);
@@ -24,23 +25,57 @@ void PlayerMovementSystem::Update(double dt)
         if (LocalPlayer.Valid()){
             updateVelocity(LocalPlayer, dt);
         }
-
+        //m_SprintEffectTimer += dt;
-        
+        //if (m_SprintEffectTimer < 0.016f) {
-        m_SprintEffectTimer += dt;
+        //    return;
-        if (m_SprintEffectTimer < 0.016f) {
+        //}
+        //m_SprintEffectTimer = 0.f;
+        //auto pool = m_World->GetComponents("SprintAbility");
+        //if (pool == nullptr) {
+        //    return;
+        //}
+        //for (auto cSprint : *pool) {
+        //    if (cSprint.EntityID != LocalPlayer.ID && (bool)cSprint["Active"]) {
+        //        // Spawn one afterimage for each player that sprints.
+        //        EntityWrapper player(m_World, cSprint.EntityID);
+        //        auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/SprintEffect.xml");
+        //        EntityWrapper sprintEffect = entityFile->MergeInto(m_World);
+        //        auto playerModel = player.FirstChildByName("PlayerModel");
+        //        if (!playerModel.Valid()) {
+        //            continue;
+        //        }
+        //        if (!playerModel.HasComponent("Model")) {
+        //            continue;
+        //        }
+        //        if (!playerModel.HasComponent("Animation")) {
+        //            continue;
+        //        }
+        //        auto playerEntityModel = playerModel["Model"];
+        //        auto playerEntityAnimation = playerModel["Animation"];
+        //        playerEntityModel.Copy(sprintEffect["Model"]);
+        //        playerEntityAnimation.Copy(sprintEffect["Animation"]);
+        //        sprintEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
+        //        ((Field<glm::vec4>)sprintEffect["ExplosionEffect"]["EndColor"]).w(0.f);
+        //        sprintEffect["Animation"]["Speed1"] = 0.0;
+        //        sprintEffect["Animation"]["Speed2"] = 0.0;
+        //        sprintEffect["Animation"]["Speed3"] = 0.0;
+        //        sprintEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+        //        sprintEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+        //    }
+        //}
+        m_DashEffectTimer += dt;
+        if (m_DashEffectTimer < 0.075f) {
             return;
         }
-        m_SprintEffectTimer = 0.f;
+        m_DashEffectTimer = 0.f;
-        auto pool = m_World->GetComponents("SprintAbility");
+        auto pool = m_World->GetComponents("DashAbility");
         if (pool == nullptr) {
             return;
         }
-        for (auto cSprint : *pool) {
+        for (auto cDash : *pool) {
-            if (cSprint.EntityID != LocalPlayer.ID && (bool)cSprint["Active"]) {
+            if (cDash.EntityID != LocalPlayer.ID && (double)cDash["CoolDownMaxTimer"] - (double)cDash["CoolDownTimer"] < 0.5) {
-                // Spawn one afterimage for each player that sprints.
+                // Spawn one afterimage for each player that Dashes.
-                EntityWrapper player(m_World, cSprint.EntityID);
+                EntityWrapper player(m_World, cDash.EntityID);
-                auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/SprintEffect.xml");
-                EntityWrapper sprintEffect = entityFile->MergeInto(m_World);
                 auto playerModel = player.FirstChildByName("PlayerModel");
                 if (!playerModel.Valid()) {
                     continue;
@@ -48,20 +83,28 @@ void PlayerMovementSystem::Update(double dt)
                 if (!playerModel.HasComponent("Model")) {
                     continue;
                 }
-                if (!playerModel.HasComponent("Animation")) {
+                EntityWrapper dashEffect = playerModel.Clone();
-                    continue;
+                for (auto& cAnim : dashEffect.ChildrenWithComponent("Animation")) {
+                    cAnim["Animation"]["Play"] = false;
                 }
-                auto playerEntityModel = playerModel["Model"];
+                const double fadeTime = 0.5f;
-                auto playerEntityAnimation = playerModel["Animation"];
+                for (auto& cModel : dashEffect.ChildrenWithComponent("Model")) {
-                playerEntityModel.Copy(sprintEffect["Model"]);
+                    EntityWrapper e(m_World, cModel.ID);
-                playerEntityAnimation.Copy(sprintEffect["Animation"]);
+                    e.AttachComponent("Lifetime");
-                sprintEffect["ExplosionEffect"]["EndColor"] = (glm::vec4)playerEntityModel["Color"];
+                    e.AttachComponent("Fade");
-                ((Field<glm::vec4>)sprintEffect["ExplosionEffect"]["EndColor"]).w(0.f);
+                    e["Fade"]["Loop"] = false;
-                sprintEffect["Animation"]["Speed1"] = 0.0;
+                    e["Fade"]["FadeTime"] = fadeTime;
-                sprintEffect["Animation"]["Speed2"] = 0.0;
+                    e["Fade"]["Time"] = fadeTime;
-                sprintEffect["Animation"]["Speed3"] = 0.0;
+                    e["Lifetime"]["Lifetime"] = fadeTime;
-                sprintEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+                }
-                sprintEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
+                dashEffect.AttachComponent("Lifetime");
+                dashEffect.AttachComponent("Fade");
+                dashEffect["Fade"]["Loop"] = false;
+                dashEffect["Fade"]["FadeTime"] = fadeTime;
+                dashEffect["Fade"]["Time"] = fadeTime;
+                dashEffect["Lifetime"]["Lifetime"] = fadeTime;
+                dashEffect["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
+                dashEffect["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
             }
         }
     }
@@ -159,12 +202,18 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
 
             if (addSpeed > 0) {
                 static float accel = 15.f;
+#ifdef DEBUG
                 ImGui::InputFloat("accel", &accel);
+#endif
                 static float airAccel = 0.5f;
+#ifdef DEBUG
                 ImGui::InputFloat("airAccel", &airAccel);
+#endif
                 float actualAccel = isOnGround ? accel : airAccel;
                 static float surfaceFriction = 5.f;
+#ifdef DEBUG
                 ImGui::InputFloat("surfaceFriction", &surfaceFriction);
+#endif
                 float accelerationSpeed = actualAccel * (float)dt * wishSpeed * surfaceFriction;
                 //if doubleTapped do Assault Dash - but only boost maximum 50.0f
                 float doubleTapDashBoost = controller->AssaultDashDoubleTapped() ? 40.0f : 1.0f;
@@ -177,7 +226,9 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                     accelerationSpeed *= (double)player["SprintAbility"]["StrengthOfEffect"];
                 }
                 velocity += accelerationSpeed * (glm::vec3)wishDirection;
+#ifdef DEBUG
                 ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x(), velocity.y(), velocity.z(), glm::length((glm::vec3)velocity));
+#endif
             }
 
             if (isOnGround) {
@@ -293,10 +344,14 @@ void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
     // Ground friction
     float speed = glm::length((glm::vec3)velocity);
     static float groundFriction = 7.f;
+#ifdef DEBUG
     ImGui::InputFloat("groundFriction", &groundFriction);
+#endif
     static float airFriction = 2.f;
 
+#ifdef DEBUG
     ImGui::InputFloat("airFriction", &airFriction);
+#endif
     float friction = isOnGround ? groundFriction : airFriction;
     if (speed > 0) {
         float drop = speed * friction * (float)dt;

src/Game/Systems/SoundSystem.cpp

@@ -87,6 +87,9 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
     if (!e.Victim.Valid() || !e.Inflictor.Valid()) {
         return false;
     }
+    if (e.Victim.ID != LocalPlayer.ID) {
+        return false;
+    }
     auto victimTeam = m_World->GetComponent(e.Victim.ID, "Team");
     auto inflictorTeam = m_World->GetComponent(e.Inflictor.ID, "Team");
     if ((int)victimTeam["Team"] == (int)inflictorTeam["Team"]) {

src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

@@ -247,7 +247,8 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         float distance = traceRayDistance(origin, direction);
         EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
         if (ray.Valid()) {
-            ((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
         }
     }
     //MuzzleFlash

src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp

@@ -324,23 +324,23 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
     spawnTracers(cWeapon, wi, pattern);
 
     // View punch
-    //if (IsClient) {
+    if (IsClient) {
-    //    EntityWrapper camera = wi.Player.FirstChildByName("Camera");
+        EntityWrapper camera = wi.Player.FirstChildByName("Camera");
-    //    if (camera.Valid()) {
+        if (camera.Valid()) {
-    //        glm::vec3& cameraOrientation = camera["Transform"]["Orientation"];
+            Field<glm::vec3> cameraOrientation = camera["Transform"]["Orientation"];
-    //        float viewPunch = cWeapon["ViewPunch"];
+            float viewPunch = cWeapon["ViewPunch"];
-    //        float maxTravelAngle = cWeapon["MaxTravelAngle"];
+            float maxTravelAngle = (const float&)cWeapon["MaxTravelAngle"];
-    //        float& currentTravel = cWeapon["CurrentTravel"];
+            Field<float> currentTravel = cWeapon["CurrentTravel"];
-    //        if (currentTravel < maxTravelAngle) {
+            if (currentTravel < maxTravelAngle) {
-    //            float change = viewPunch;
+                float change = viewPunch;
-    //            if (currentTravel + change > maxTravelAngle) {
+                if (currentTravel + change > maxTravelAngle) {
-    //                change = maxTravelAngle - currentTravel;
+                    change = maxTravelAngle - currentTravel;
-    //            }
+                }
-    //            cameraOrientation.x += change;
+                cameraOrientation.x(cameraOrientation.x() + change);
-    //            currentTravel += change;
+                currentTravel += change;
-    //        }
+            }
-    //    }
+        }
-    //}
+    }
 
     // Play animation
     playAnimationAndReturn(wi.FirstPersonEntity, "FinalBlend", "Fire");
@@ -395,9 +395,12 @@ void DefenderWeaponBehaviour::spawnTracers(ComponentWrapper cWeapon, WeaponInfo&
                 glm::vec3 muzzlePosition = TransformSystem::AbsolutePosition(muzzle);
                 glm::quat muzzleOrientation = TransformSystem::AbsoluteOrientation(muzzle);
 
-                rayOrigin = muzzlePosition;
 
                 glm::vec3 muzzleToHit = hitPosition - muzzlePosition;
+
+                rayOrigin = muzzlePosition + (muzzleToHit/2.f);
+
+
                 glm::vec3 lookVector = glm::normalize(-muzzleToHit);
                 float pitch = std::asin(-lookVector.y);
                 float yaw = std::atan2(lookVector.x, lookVector.z);
@@ -459,8 +462,8 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         }
 
         // Temp hit decal
-        EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
+//         EntityWrapper hit = ResourceManager::Load<EntityFile>("Schema/Entities/HitTest.xml")->MergeInto(m_World);
-        (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
+//         (Field<glm::vec3>)hit["Transform"]["Position"] = pick.Position;
 
         // Don't let us shoot ourselves in the foot somehow
         if (victim == LocalPlayer) {
@@ -477,12 +480,17 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
 
         // Check for friendly fire
         if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) {
-            // TODO: Ammo sharing
+            // Give boost
+            Events::PlayerDamage ePlayerDamage;
+            ePlayerDamage.Inflictor = wi.Player;
+            ePlayerDamage.Victim = victim;
+            ePlayerDamage.Damage = 0;
+            m_EventBroker->Publish(ePlayerDamage);
             continue;
         }
 
         damageSum[victim] += pelletDamage;
-        ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
+       // ((Field<glm::vec4>)hit["Model"]["Color"]).z(1.f);
     }
 
     // Deal damage!
@@ -493,7 +501,6 @@ void DefenderWeaponBehaviour::dealDamage(ComponentWrapper cWeapon, WeaponInfo& w
         ePlayerDamage.Victim = kv.first;
         ePlayerDamage.Damage = kv.second;
         m_EventBroker->Publish(ePlayerDamage);
-        LOG_DEBUG("Dealt %f damage to #%i", kv.second, kv.first.ID);
     }
 }
 

src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

@@ -69,6 +69,21 @@ void SidearmWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
         }
     }
 
+    // Restore view angle
+    if (IsClient) {
+        Field<float> currentTravel = cWeapon["CurrentTravel"];
+        Field<float> returnSpeed = cWeapon["ViewReturnSpeed"];
+        if (currentTravel > 0) {
+            float change = returnSpeed * dt;
+            currentTravel = glm::max(0.f, currentTravel - change);
+            EntityWrapper camera = wi.Player.FirstChildByName("Camera");
+            if (camera.Valid()) {
+                Field<glm::vec3> cameraOrientation = camera["Transform"]["Orientation"];
+                cameraOrientation.x(cameraOrientation.x() - change);
+            }
+        }
+    }
+
     if ((bool)cWeapon["Automatic"] && canFire(cWeapon)) {
         fireBullet(cWeapon, wi);
     }
@@ -183,21 +198,41 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         magAmmo -= 1;
     }
 
+    // View punch
+    if (IsClient) {
+        EntityWrapper camera = wi.Player.FirstChildByName("Camera");
+        if (camera.Valid()) {
+            Field<glm::vec3> cameraOrientation = camera["Transform"]["Orientation"];
+            float viewPunch = cWeapon["ViewPunch"];
+            float maxTravelAngle = cWeapon["MaxTravelAngle"];
+            Field<float> currentTravel = cWeapon["CurrentTravel"];
+            if (currentTravel < maxTravelAngle) {
+                float change = viewPunch;
+                if (currentTravel + change > maxTravelAngle) {
+                    change = maxTravelAngle - currentTravel;
+                }
+                cameraOrientation.x(cameraOrientation.x() + change);
+                currentTravel += change;
+            }
+        }
+    }
+
     // Get weapon model based on current person
     EntityWrapper weaponModelEntity = getRelevantWeaponEntity(wi);
     if (!weaponModelEntity.Valid()) {
         return;
     }
 
-    //Tracer
+    // Tracer
     EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
     if (tracerSpawner.Valid()) {
         glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner);
-        glm::vec3 direction = TransformSystem::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1);
+        glm::vec3 direction = glm::quat(TransformSystem::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
         float distance = traceRayDistance(origin, direction);
         EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
         if (ray.Valid()) {
-            ((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
         }
     }