From e24a0b127b9c7be5b871fd56a5df265272c1338d Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Thu, 3 Mar 2016 20:59:30 +0100
Subject: [PATCH] Added Ability cooldown UI and missing texture

---
 assets                                        |  2 +-
 .../Entities/PlayerAssaultFallbackBlue.xml    | 68 ++++++++++---------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/assets b/assets
index 7a6d7078..c82b5716 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 7a6d70787b036d8ae8763b69ae6ad098bf221c22
+Subproject commit c82b5716d98a0c9fb3914367e9b08cc2e7dbca43
diff --git a/resources/Schema/Entities/PlayerAssaultFallbackBlue.xml b/resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
index bb6367f8..d5d7579c 100644
--- a/resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
+++ b/resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
@@ -169,6 +169,40 @@
                         </Entity>
                       </Children>
                     </Entity>
+                     <Entity name="ShiftAbility">
+                      <Components>
+                        <c:AbilityCooldownHUD/>
+                        <c:Fill>
+                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+                        </c:Fill>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
+                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="Cooldown">
+                          <Components>
+                            <c:Text>
+                              <Content>0.0</Content>
+                              <Resource>Fonts/DroidSans.ttf,64</Resource>
+                              <Color A="1" B="0" G="0" R="0"/>
+                            </c:Text>
+                            <c:Transform>
+                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+                              <Orientation X="0" Y="0" Z="1.57099998"/>
+                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
                   </Children>
                 </Entity>
                 <Entity name="HealthText">
@@ -538,6 +572,7 @@
         <c:Model>
           <Resource>Models/Characters/Assault/AssaultBlue.mesh</Resource>
           <Color A="1" B="1" G="0.952941179" R="1"/>
+          <Visible>false</Visible>
         </c:Model>
         <c:Transform/>
       </Components>
@@ -561,38 +596,7 @@
               <Orientation X="-0.00425229501" Y="-0.0330814682" Z="0.137528151"/>
             </c:Transform>
           </Components>
-          <Children>
-            <Entity name="AssaultWeapon">
-              <Components>
-                <c:Model>
-                  <Resource>Models/Weapons/Blue/AssaultWeaponBlue.mesh</Resource>
-                </c:Model>
-                <c:Transform/>
-              </Components>
-              <Children>
-                <Entity name="WeaponMuzzle">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/RayBlue.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform>
-                      <Position X="0.00624208851" Y="0.0957332104" Z="-0.159257293"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
-                <Entity name="ThirdPersonReloadSpawner">
-                  <Components>
-                    <c:Spawner>
-                      <EntityFile>Schema/Entities/ReloadEffectWorld.xml</EntityFile>
-                    </c:Spawner>
-                    <c:Transform/>
-                  </Components>
-                  <Children/>
-                </Entity>
-              </Children>
-            </Entity>
-          </Children>
+          <Children/>
         </Entity>
         <Entity name="SecondaryAttachment">
           <Components>