diff --git a/assets b/assets
index 69ddae17..40f6ae62 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 69ddae179ac02d5c1582a8c6834451b3f5e4bbaf
+Subproject commit 40f6ae6201adb94e99ee084b081fc8467f80953a
diff --git a/resources/Schema/Entities/PlayerAssaultBlue.xml b/resources/Schema/Entities/PlayerAssaultBlue.xml
index 4ca636da..33f1df73 100644
--- a/resources/Schema/Entities/PlayerAssaultBlue.xml
+++ b/resources/Schema/Entities/PlayerAssaultBlue.xml
@@ -57,449 +57,468 @@
-
+
-
-
-
+
+ Schema/Entities/PlayerHUD.xml
+
+
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Weapons/Crosshair/SmallThickHoleDot.png
-
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/HitMarker.xml
-
-
-
-
-
-
+
-
-
+
-
+
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- 4
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Widgets/Arrows/Arrow5.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- 100/100
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/HealthHUD3.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Boosts/Assault-01.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Boosts/Defender-01.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Boosts/Sniper-01.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
false
Models/Core/UnitQuad.mesh
- Textures\Icons\Abilities\Superman-01.png
-
+ Textures/Weapons/Crosshair/SmallThickHoleDot.png
-
-
-
+
+
+
+
+
+
+
+
+
+ Schema/Entities/HitMarker.xml
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ 4
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 0.0
+
Fonts/DroidSans.ttf,64
-
- false
+
+
+
+
+
+
+
+
+
+
+
+
+ Fonts/DroidSans.ttf,64
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Widgets/Arrows/ArrowBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ 100/100
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HealthHUD3.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Assault-01.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Defender-01.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Sniper-01.png
+
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Long/Superman-01.png
+
+ true
+
+
+
+
+
@@ -570,6 +589,7 @@
Models/Characters/Assault/AssaultBlue.mesh
+ false
@@ -583,8 +603,8 @@
Schema/Entities/WeaponAssaultBlueWorld.xml
-
-
+
+
AssaultWeapon
@@ -604,8 +624,8 @@
Schema/Entities/SidearmWeaponBlueWorld.xml
-
-
+
+
SidearmWeapon
@@ -672,7 +692,7 @@
CrouchStrafeLeftF
-
+
true
@@ -683,7 +703,7 @@
CrouchStrafeRightF
-
+
true
@@ -696,7 +716,7 @@
CrouchWalkF
-
+
true
@@ -709,7 +729,7 @@
CrouchF
-
+
true
@@ -752,7 +772,7 @@
WalkF
-
+
true
@@ -763,7 +783,7 @@
RunF
-
+
2
true
@@ -787,7 +807,7 @@
StrafeLeftF
-
+
2
true
@@ -799,7 +819,7 @@
StrafeRightF
-
+
2
true
@@ -815,7 +835,7 @@
IdleF
-
+
true
@@ -1012,7 +1032,7 @@
IdleAssaultRifleU
-
+
true
true
@@ -1024,7 +1044,7 @@
IdleAssaultRifleU
-
+
true
true
diff --git a/resources/Schema/Entities/PlayerDefenderBlue.xml b/resources/Schema/Entities/PlayerDefenderBlue.xml
index 5fcc6c64..30b0a3a1 100644
--- a/resources/Schema/Entities/PlayerDefenderBlue.xml
+++ b/resources/Schema/Entities/PlayerDefenderBlue.xml
@@ -30,6 +30,7 @@
+
@@ -90,448 +91,475 @@
-
+
-
-
-
+
+ Schema/Entities/PlayerHUD.xml
+
+
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Weapons/Crosshair/SmallThickHoleDot.png
-
-
-
-
-
-
-
-
-
-
-
- Schema/Entities/HitMarker.xml
-
-
-
-
-
-
+
-
-
+
-
+
false
Models/Core/UnitQuad.mesh
- Textures/Core/UnitHexagon.png
-
+ Textures/Weapons/Crosshair/SmallThickHoleDot.png
-
+
+
-
-
-
-
-
-
-
- 2
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
+
-
+
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- 4
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
+
+ Schema/Entities/HitMarker.xml
+
-
+
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Widgets/Arrows/Arrow5.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- 150/150
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/HealthHUD3.png
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
false
Models/Core/UnitQuad.mesh
- Textures/Icons/Boosts/Assault-01.png
-
+ Textures/Core/UnitHexagon.png
+
+ true
-
-
-
+
+
+
+
+
+
+
+ 1
+
+
+
+ 4
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
-
+
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Boosts/Defender-01.png
-
-
+
+
+ Fonts/DroidSans.ttf,64
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Boosts/Sniper-01.png
-
-
-
-
-
-
+
-
+
-
-
- inf
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures\Icons\Abilities\SheildDots-01.png
-
-
+
+
+
+
+
+
+
+ Models/Widgets/Arrows/ArrowBlue.mesh
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ 150/150
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HealthHUD3.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Assault-01.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Defender-01.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Sniper-01.png
+
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Long/SheildDots-01.png
+
+ true
+
+
+
+
+
+
+
+
+
+
+
@@ -564,6 +592,7 @@
+ 1.7999999523162842
Models/Characters/Defender/DefenderBlue.mesh
@@ -578,8 +607,8 @@
Schema/Entities/WeaponDefenderBlueWorld.xml
-
-
+
+
DefenderWeapon
@@ -599,8 +628,8 @@
Schema/Entities/SidearmWeaponBlueWorld.xml
-
-
+
+
SidearmWeapon
@@ -667,7 +696,7 @@
CrouchStrafeLeftF
-
+
true
@@ -678,7 +707,7 @@
CrouchStrafeRightF
-
+
true
@@ -691,7 +720,7 @@
CrouchWalkF
-
+
true
@@ -704,7 +733,7 @@
CrouchF
-
+
true
@@ -747,7 +776,7 @@
WalkF
-
+
true
@@ -758,7 +787,7 @@
RunF
-
+
2
true
@@ -782,7 +811,7 @@
StrafeLeftF
-
+
2
true
@@ -794,7 +823,7 @@
StrafeRightF
-
+
2
true
@@ -810,7 +839,7 @@
IdleF
-
+
true
@@ -877,7 +906,7 @@
IdleAssaultRifleU
-
+
true
true
@@ -889,7 +918,7 @@
IdleAssaultRifleU
-
+
true
true
@@ -969,7 +998,7 @@
ShieldFrontU
-
+
true
diff --git a/resources/Schema/Entities/PlayerHUD.xml b/resources/Schema/Entities/PlayerHUD.xml
index cf07bc56..5891362d 100644
--- a/resources/Schema/Entities/PlayerHUD.xml
+++ b/resources/Schema/Entities/PlayerHUD.xml
@@ -11,9 +11,10 @@
- Textures/Weapons/Crosshair/SmallThickHoleDot.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Weapons/Crosshair/SmallThickHoleDot.png
@@ -42,10 +43,52 @@
- Textures/Core/UnitHexagon.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+
+ true
@@ -61,9 +104,11 @@
3
- Textures/Core/UnitHexagon_Rotated.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
@@ -78,10 +123,12 @@
- Textures/Core/UnitHexagon.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+ true
@@ -98,9 +145,11 @@
4
- Textures/Core/UnitHexagon_Rotated.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
@@ -115,46 +164,12 @@
- Textures/Core/UnitHexagon.png
-
false
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2
-
-
- Textures/Core/UnitHexagon_Rotated.png
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/UnitHexagon.png
+ Models/Core/UnitQuad.mesh
- false
+ Textures/Core/UnitHexagon.png
+ true
@@ -170,9 +185,11 @@
1
- Textures/Core/UnitHexagon_Rotated.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
@@ -187,10 +204,12 @@
- Textures/Core/UnitHexagon.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon.png
+ true
@@ -205,9 +224,11 @@
- Textures/Core/UnitHexagon_Rotated.png
-
false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/UnitHexagon_Rotated.png
+ true
@@ -284,10 +305,11 @@
- Models/Widgets/Arrows/Arrow5.mesh
+ Models/Widgets/Arrows/ArrowBlue.mesh
+
@@ -310,7 +332,7 @@
100/100
Fonts/DroidSans.ttf,64
-
+
@@ -329,9 +351,11 @@
- Textures/HealthHUD3.png
+ Models/Core/UnitQuad.mesh
+ Textures/HealthHUD3.png
+ true
@@ -350,16 +374,18 @@
-
+
- Textures/Icons/Boosts/Assault-01.png
-
false
-
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Assault-01.png
+
+ true
-
+
@@ -369,16 +395,18 @@
-
+
- Textures/Icons/Boosts/Defender-01.png
-
false
-
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Defender-01.png
+
+ true
-
+
@@ -388,13 +416,16 @@
-
+
- Textures/Icons/Boosts/Sniper-01.png
-
false
-
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Boosts/Sniper-01.png
+
+ false
+ true
@@ -413,15 +444,17 @@
- Textures/Icons/Abilities/Superman-01.png
-
false
-
+ Models/Core/UnitQuad.mesh
+
+ Textures/Test/aM4ME4GR.png
+
+ true
-
-
+
+
diff --git a/resources/Schema/Entities/StartMenu_simple.xml b/resources/Schema/Entities/StartMenu_simple.xml
new file mode 100644
index 00000000..944c51b5
--- /dev/null
+++ b/resources/Schema/Entities/StartMenu_simple.xml
@@ -0,0 +1,440 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/NewMap2version5NEW.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.10000000149011612
+
+
+
+
+
+
+
+
+
+
+ 0.20000000298023224
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/MainMenu.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ Play
+ 1
+
+
+
+
+
+
+
+
+
+
+ Play
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Credits
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Option
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+
+
+
+
+
+
+
+
+ Quit
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/ServerList.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Shaders/Sprite.frag.glsl b/resources/Shaders/Sprite.frag.glsl
index 5b6567eb..6a7169e1 100644
--- a/resources/Shaders/Sprite.frag.glsl
+++ b/resources/Shaders/Sprite.frag.glsl
@@ -29,9 +29,9 @@ void main()
vec4 color_result = Color * diffuseTexel;
float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
- float fillResult = floor(pos*FillPercentage);
+ float fillResult = clamp(floor(pos/FillPercentage), 0, 1);
- color_result = FillColor*diffuseTexel.a*fillResult + color_result*(1-fillResult);
+ color_result = FillColor*diffuseTexel.a*(1 - fillResult) + color_result*fillResult;
sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
diff --git a/src/Game/Systems/AbilityCooldownHUDSystem.cpp b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
index 07461f95..23e9a6b7 100644
--- a/src/Game/Systems/AbilityCooldownHUDSystem.cpp
+++ b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
@@ -23,26 +23,29 @@ void AbilityCooldownHUDSystem::Update(double dt)
if (!abilityEntity.Valid()) {
//If we dont have a shield ability, we return, since we cannot do anything.
+ if (entity.HasComponent("Sprite")) {
+ (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures/Test/aM4ME4GR.png";
+ }
return;
} else {
//If we have a shield ability, we set the right icon
abilityName = "ShieldAbility";
if (entity.HasComponent("Sprite")) {
- (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\SheildDots-01.png";
+ (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures/Icons/Abilities/Long/SheildDots-01.png";
}
}
} else {
//If we do have a sprint ability, we change the icon
abilityName = "SprintAbility";
if (entity.HasComponent("Sprite")) {
- (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\Dash-01.png";
+ (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures/Icons/Abilities/Long/Dash-01.png";
}
}
} else {
//If we have a dash ability, we set the icon to the correct one.
abilityName = "DashAbility";
if (entity.HasComponent("Sprite")) {
- (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures\\Icons\\Abilities\\Superman-01.png";
+ (std::string&)entity["Sprite"]["DiffuseTexture"] = "Textures/Icons/Abilities/Long/Superman-01.png";
}
}
@@ -63,12 +66,12 @@ void AbilityCooldownHUDSystem::Update(double dt)
}
if (abilityName == "ShieldAbility") {
- maxAbilityCD = 0.0;
+ maxAbilityCD = 1.0;
currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
}
if (abilityName == "SprintAbility") {
- maxAbilityCD = 0.0;
+ maxAbilityCD = 1.0;
currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
}