diff --git a/assets b/assets
index 0ae73657..52ea74c5 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 0ae736570b5600c2ad05f556ccaec4f5341c2b06
+Subproject commit 52ea74c5d5996ebcd7b064e0a8be469c9f07926e
diff --git a/include/Game/Systems/AbilityCooldownHUDSystem.h b/include/Game/Systems/AbilityCooldownHUDSystem.h
index 610b4dc2..f2710ce3 100644
--- a/include/Game/Systems/AbilityCooldownHUDSystem.h
+++ b/include/Game/Systems/AbilityCooldownHUDSystem.h
@@ -12,6 +12,7 @@ public:
{ }
virtual void Update(double dt) override;
+private:
};
#endif
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldAbility.xml b/resources/Schema/Components/ShieldAbility.xml
index 49fcf0c0..d66dca31 100644
--- a/resources/Schema/Components/ShieldAbility.xml
+++ b/resources/Schema/Components/ShieldAbility.xml
@@ -1,4 +1,4 @@
- 2.0
+ false
\ No newline at end of file
diff --git a/resources/Schema/Components/ShieldAbility.xsd b/resources/Schema/Components/ShieldAbility.xsd
index 5cf2145c..bbb30c82 100644
--- a/resources/Schema/Components/ShieldAbility.xsd
+++ b/resources/Schema/Components/ShieldAbility.xsd
@@ -9,8 +9,8 @@
-
- This is the cooldown on shield
+
+ If the shield is active or not
diff --git a/resources/Schema/Entities/CP_RockHard.xml b/resources/Schema/Entities/CP_RockHard.xml
index 2231df59..9f11d052 100644
--- a/resources/Schema/Entities/CP_RockHard.xml
+++ b/resources/Schema/Entities/CP_RockHard.xml
@@ -3,8 +3,8 @@
- 1.2059834585982117
- 4
+ 0.58443805362486501
+ 3
@@ -34,27 +34,6 @@
-
-
-
-
- Models/Props/Walls/SciFiWallBig.mesh
- true
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SciFiWallMedium.mesh
-
-
-
-
-
@@ -87,6 +66,27 @@
+
+
+
+
+ Models/Props/Walls/SciFiWallBig.mesh
+ true
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SciFiWallMedium.mesh
+
+
+
+
+
@@ -708,6 +708,43 @@
+
+
+
+
+ Models/Highgrounds/Hg7.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Highgrounds/Hg17.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Highgrounds/Hg19.mesh
+
+
+
+
+
+
+
@@ -758,43 +795,6 @@
-
-
-
-
- Models/Highgrounds/Hg7.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Highgrounds/Hg17.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Highgrounds/Hg19.mesh
-
-
-
-
-
-
-
@@ -1930,6 +1930,78 @@
+
+
+
+
+
+
+
+
+
+ Models/Props/SciFiHolder1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/SciFiHolder1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/SciFiHolder1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/SciFiHolder1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/SciFiHolder1.mesh
+
+
+
+
+
+
+
+
+
+
@@ -2309,7 +2381,7 @@
-
+
@@ -2318,11 +2390,38 @@
- Models/Props/Bridges/SciFiBridge1Red.mesh
+ Models/Props/Stones/SmallStone2.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
@@ -2330,116 +2429,12 @@
- Models/Props/Bridges/SciFiBridge1Red.mesh
+ Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/SciFiBridgePillar1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/SciFiBridgePillar1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Bridges/SciFiBridgeDefense.mesh
-
-
-
-
+
+
+
@@ -2450,16 +2445,1521 @@
- Models/Props/Pillars/SciFiBridgePillar1.mesh
+ Models/Props/Stones/SmallStone1.mesh
-
-
-
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/StonePillar.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/AmmoPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/AmmoPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/AmmoPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiPillar2Red.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/StonePillar.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/StonePillar.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/StonePillar.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Pillars/SciFiPillar1Red.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiPillar2Red.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SpecialWall1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SpecialWall1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SpecialWall1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SpecialWall1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2578,6 +4078,152 @@
+
+
+
+
+ Models/Props/Bridges/SciFiBridge1Red.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridge1Red.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiBridgePillar1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiBridgePillar1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Bridges/SciFiBridgeDefense.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiBridgePillar1.mesh
+
+
+
+
+
+
+
+
+
@@ -2594,95 +4240,6 @@
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/SciFiPillar2Red.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Pillars/SciFiPillar1Red.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/SciFiPillar2Red.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
@@ -2701,6 +4258,20 @@
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
@@ -2741,1575 +4312,6 @@
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/AmmoPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/AmmoPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/AmmoPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Core/UnitPlane.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/SciFiHolder1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/SciFiHolder1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/SciFiHolder1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/SciFiHolder1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/SciFiHolder1.mesh
-
-
-
-
-
-
-
-
@@ -4324,78 +4326,13 @@
Models/Props/Walls/SmallWall3.mesh
-
+
+
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallRed.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallRed.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
@@ -4403,53 +4340,13 @@
Models/Props/Walls/SmallWall3.mesh
-
+
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
@@ -4467,12 +4364,11 @@
- Models/Props/Walls/SmallWall3.mesh
+ Models/Props/Walls/MediumWall3.mesh
-
-
-
+
+
@@ -4484,7 +4380,21 @@
Models/Props/Walls/BigWallRed.mesh
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallRed.mesh
+
+
+
@@ -4494,12 +4404,24 @@
- Models/Props/Walls/SmallWall3.mesh
+ Models/Props/Walls/MediumWall3.mesh
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
@@ -4511,8 +4433,8 @@
Models/Props/Walls/SmallWall3.mesh
-
-
+
+
@@ -4538,26 +4460,13 @@
Models/Props/Walls/SmallWall3.mesh
-
+
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
@@ -4565,54 +4474,13 @@
Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
+
+
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
@@ -4620,22 +4488,8 @@
Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
+
+
@@ -4670,11 +4524,11 @@
- Models/Props/Walls/MediumWall3.mesh
+ Models/Props/Walls/BigWallRed.mesh
-
-
+
+
@@ -4686,13 +4540,188 @@
Models/Props/Walls/SmallWall3.mesh
-
-
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
@@ -4706,36 +4735,9 @@
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallRed.mesh
-
-
-
-
-
-
-
-
-
+
@@ -4744,12 +4746,11 @@
- Models/Props/Walls/SpecialWall1.mesh
+ Models/Props/Stones/AssaultHolder.mesh
-
-
-
+
+
@@ -4758,12 +4759,11 @@
- Models/Props/Walls/SpecialWall1.mesh
+ Models/Props/Stones/AssaultHolder.mesh
-
-
-
+
+
@@ -4772,32 +4772,32 @@
- Models/Props/Walls/SpecialWall1.mesh
+ Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SpecialWall1.mesh
-
-
-
-
-
+
+
+
+
+
+ Models/Core/UnitPlane.mesh
+
+ true
+
+
+
+
+
+
+
+
+
@@ -4805,6 +4805,43 @@
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Stones/ShinyStoneCrystalRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Stones/ShinyStoneCrystalRed.mesh
+
+
+
+
+
+
+
+
+
+
+
@@ -4817,8 +4854,8 @@
Models/Props/Stones/AssaultHolder.mesh
-
-
+
+
@@ -4844,21 +4881,8 @@
Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
+
+
@@ -4884,8 +4908,8 @@
Models/Props/Stones/AssaultHolder.mesh
-
-
+
+
@@ -4897,89 +4921,8 @@
Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
+
+
@@ -4997,33 +4940,6 @@
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/AssaultHolder.mesh
-
-
-
-
-
-
-
-
@@ -5045,8 +4961,129 @@
Models/Props/Stones/AssaultHolder.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/AssaultHolder.mesh
+
+
+
+
+
@@ -5058,6 +5095,60 @@
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallRed.mesh
+
+
+
+
+
+
+
+
@@ -5075,11 +5166,12 @@
- Models/Props/Walls/MediumWall3.mesh
+ Models/Props/Walls/SmallWall3.mesh
-
-
+
+
+
@@ -5098,6 +5190,19 @@
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
@@ -5132,22 +5237,29 @@
Models/Props/Walls/SmallWall3.mesh
-
-
+
+
+
+
+
+
+
+
+
- Models/Props/Walls/BigWallRed.mesh
+ Models/Props/Stones/BigStone.mesh
-
-
+
+
@@ -5156,11 +5268,11 @@
- Models/Props/Walls/BigWallBlue.mesh
+ Models/Props/Stones/MediumStone2.mesh
-
-
+
+
@@ -5169,12 +5281,11 @@
- Models/Props/Walls/SmallWall3.mesh
+ Models/Props/Pillars/StonePillar.mesh
-
-
-
+
+
@@ -5183,11 +5294,52 @@
- Models/Props/Walls/SmallWall3.mesh
+ Models/Props/Stones/SmallStone1.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
@@ -5197,12 +5349,226 @@
- Models/Props/Walls/SmallWall3.mesh
+ Models/Props/Stones/MediumStone2.mesh
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/mediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
@@ -5246,7 +5612,7 @@
-
+
@@ -5288,7 +5654,7 @@
-
+
@@ -5300,372 +5666,6 @@
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalRed.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalRed.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/mediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
@@ -5688,24 +5688,9 @@
Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
-
-
+
+
+
@@ -5739,9 +5724,10 @@
+ 2
-
+
@@ -5750,10 +5736,9 @@
- 2
-
+
@@ -5764,27 +5749,13 @@
- 5
+ 4
Models/Props/Stones/ShinyStoneCrystalBlue.mesh
+
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
-
+
+
@@ -5818,6 +5789,21 @@
+
+
+
+
+ 6
+ Models/Props/Stones/ShinyStoneCrystalBlue.mesh
+
+
+
+
+
+
+
+
+
@@ -5833,36 +5819,6 @@
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
-
-
-
-
-
-
@@ -5878,6 +5834,19 @@
+
+
+
+
+ 2
+ 1
+
+
+
+
+
+
+
@@ -5902,32 +5871,63 @@
-
-
-
-
- 2
- 1
-
-
-
-
-
-
-
- 4
+ 6
Models/Props/Stones/ShinyStoneCrystalBlue.mesh
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ Models/Props/Stones/ShinyStoneCrystalBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Stones/ShinyStoneCrystalBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Stones/ShinyStoneCrystalBlue.mesh
+
+
+
+
@@ -5959,37 +5959,11 @@
- Models/Props/Stones/SmallStone1.mesh
+ Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
+
+
@@ -5999,11 +5973,25 @@
- Models/Props/Stones/MediumStone2.mesh
+ Models/Props/Stones/SmallStone1.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
@@ -6035,193 +6023,6 @@
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
@@ -6249,6 +6050,32 @@
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
@@ -6256,9 +6083,8 @@
Models/Props/Stones/SmallStone2.mesh
-
-
-
+
+
@@ -6267,51 +6093,11 @@
- Models/Props/Stones/SmallStone1.mesh
+ Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
+
+
@@ -6336,106 +6122,13 @@
Models/Props/Stones/SmallStone1.mesh
-
-
+
+
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
@@ -6450,20 +6143,6 @@
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
@@ -6471,54 +6150,13 @@
Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
+
+
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
@@ -6526,22 +6164,8 @@
Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
+
+
@@ -6567,8 +6191,128 @@
Models/Props/Stones/SmallStone2.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
@@ -6586,6 +6330,112 @@
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
@@ -6607,9 +6457,9 @@
Models/Props/Stones/SmallStone1.mesh
-
-
-
+
+
+
@@ -6618,10 +6468,11 @@
- Models/Props/Stones/SmallStone2.mesh
+ Models/Props/Stones/BigStone.mesh
-
+
+
@@ -6633,26 +6484,26 @@
Models/Props/Stones/SmallStone1.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
-
-
-
-
@@ -6660,8 +6511,9 @@
Models/Props/Stones/SmallStone2.mesh
-
-
+
+
+
@@ -6670,37 +6522,12 @@
- Models/Props/Stones/SmallStone2.mesh
+ Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone2.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/MediumStone2.mesh
-
-
-
-
+
+
+
@@ -6732,33 +6559,6 @@
-
-
-
-
- Models/Props/Stones/BigStone.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Stones/SmallStone1.mesh
-
-
-
-
-
-
-
-
@@ -6780,13 +6580,213 @@
Models/Props/Stones/SmallStone1.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/MediumStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone1.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/SmallStone2.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Stones/BigStone.mesh
+
+
+
+
+
+
+
+
+
@@ -6822,90 +6822,6 @@
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/AmmoPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/PickUps/PickUpHolder.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 8
-
-
-
- Models/Props/PickUps/HealthPickUp.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -6938,7 +6854,7 @@
-
+
@@ -6980,7 +6896,7 @@
-
+
@@ -7022,7 +6938,91 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/AmmoPickUp.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/PickUps/PickUpHolder.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+ Models/Props/PickUps/HealthPickUp.mesh
+
+
+
+
@@ -7064,7 +7064,7 @@
-
+
@@ -7106,7 +7106,7 @@
-
+
@@ -7193,7 +7193,37 @@
Models/Props/Pillars/StonePillar.mesh
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiPillar2Blue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Pillars/SciFiPillar1Blue.mesh
+
+
+
+
+
@@ -7212,6 +7242,18 @@
+
+
+
+
+ Models/Props/Pillars/StonePillar.mesh
+
+
+
+
+
+
+
@@ -7226,48 +7268,6 @@
-
-
-
-
- Models/Props/Pillars/SciFiPillar2Blue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Pillars/StonePillar.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Pillars/SciFiPillar1Blue.mesh
-
-
-
-
-
-
-
-
-
@@ -7548,9 +7548,8 @@
Models/Props/Flora/SpecialRoot.mesh
-
-
-
+
+
@@ -7562,8 +7561,9 @@
Models/Props/Flora/SpecialRoot.mesh
-
-
+
+
+
@@ -7610,7 +7610,7 @@
Models/Props/Walls/SmallWall3.mesh
-
+
@@ -7624,7 +7624,8 @@
Models/Props/Walls/SmallWall3.mesh
-
+
+
@@ -7637,61 +7638,9 @@
Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
+
+
+
@@ -7717,88 +7666,7 @@
Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/BigWallBlue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
+
@@ -7851,13 +7719,38 @@
Models/Props/Walls/SmallWall3.mesh
-
-
+
+
+
+
+
+ Models/Props/Walls/BigWallBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
@@ -7865,27 +7758,13 @@
Models/Props/Walls/SmallWall3.mesh
-
-
+
+
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
@@ -7899,6 +7778,32 @@
+
+
+
+
+ Models/Props/Walls/BigWallBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
@@ -7906,7 +7811,89 @@
Models/Props/Walls/SmallWall3.mesh
-
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/BigWallBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
@@ -7939,6 +7926,59 @@
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/MediumWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Walls/SmallWall3.mesh
+
+
+
+
+
+
+
+
@@ -7952,46 +7992,6 @@
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/SmallWall3.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/Walls/MediumWall3.mesh
-
-
-
-
-
-
-
-
@@ -8151,12 +8151,11 @@
6
- Models/Props/Pillars/SciFiPillar2Blue.mesh
+ Models/Props/Pillars/SciFiPillar1Blue.mesh
-
-
-
+
+
@@ -8180,12 +8179,12 @@
4
- Models/Props/Pillars/SciFiPillar2Red.mesh
+ Models/Props/Pillars/SciFiPillar3Blue.mesh
-
-
-
+
+
+
@@ -8198,8 +8197,8 @@
Models/Props/Pillars/SciFiPillar2Blue.mesh
-
-
+
+
@@ -8222,12 +8221,13 @@
- Models/Props/Pillars/SciFiPillar2Blue.mesh
+ 4
+ Models/Props/Pillars/SciFiPillar2Red.mesh
-
-
-
+
+
+
@@ -8255,37 +8255,9 @@
Models/Props/Pillars/SciFiPillar2Blue.mesh
-
-
-
-
-
-
-
-
-
-
- 4
- Models/Props/Pillars/SciFiPillar3Blue.mesh
-
-
-
-
-
-
-
-
-
-
-
-
-
- 6
- Models/Props/Pillars/SciFiPillar1Blue.mesh
-
-
-
-
+
+
+
@@ -8298,8 +8270,36 @@
Models/Props/Pillars/SciFiPillar2Blue.mesh
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Props/Pillars/SciFiPillar2Blue.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+ Models/Props/Pillars/SciFiPillar2Blue.mesh
+
+
+
+
@@ -8353,283 +8353,6 @@
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
-
- 0.40000000596046448
-
-
-
-
-
-
-
-
-
-
- 0.69999998807907104
- 1.6000000238418579
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
-
-
- 10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/CapturePoint/CapturePointNeutral.mesh
-
-
-
-
-
-
-
-
-
- 15
- 2
-
-
-
- Models/Core/UnitCylinder.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/CapturePoint/CapturePointBlue.mesh
-
-
-
-
-
-
-
-
-
- -15
-
-
-
- 4
-
-
-
- Models/Core/UnitCylinder.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/CapturePoint/CapturePointNeutral.mesh
-
-
-
-
-
-
-
-
-
- 15
- 1
-
-
-
- Models/Core/UnitCylinder.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/CapturePoint/CapturePointNeutral.mesh
-
-
-
-
-
-
-
-
-
- 3
-
-
-
- Models/Core/UnitCylinder.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Models/Props/CapturePoint/CapturePointRed.mesh
-
-
-
-
-
-
-
-
-
- 15
-
-
-
-
-
-
- Models/Core/UnitCylinder.mesh
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8637,15 +8360,15 @@
-
-
- Schema/Entities/PlayerAssaultFallbackBlue.xml
-
+
+
+ Schema/Entities/PlayerAssaultFallbackBlue.xml
+
@@ -8657,9 +8380,7 @@
Models/Characters/Assault/Test/AssaultTPose.mesh
-
-
-
+
@@ -8693,7 +8414,9 @@
Models/Characters/Assault/Test/AssaultTPose.mesh
-
+
+
+
@@ -8725,20 +8448,32 @@
-
-
- Schema/Entities/PlayerAssaultFallbackRed.xml
-
+
+
+ Schema/Entities/PlayerAssaultFallbackRed.xml
+
+
+
+
+
+ Models/Characters/Assault/Test/AssaultTPose.mesh
+
+
+
+
+
+
+
@@ -8751,6 +8486,18 @@
+
+
+
+
+ Models/Characters/Assault/Test/AssaultTPose.mesh
+
+
+
+
+
+
+
@@ -8775,18 +8522,6 @@
-
-
-
-
- Models/Characters/Assault/Test/AssaultTPose.mesh
-
-
-
-
-
-
-
@@ -8797,14 +8532,269 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+ 0.40000000596046448
+
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+ 0.69999998807907104
+ 1.6000000238418579
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/CapturePoint/CapturePointNeutral.mesh
+
+
+
+
+
+
-
+
+ 3
+
+
+
- Models/Characters/Assault/Test/AssaultTPose.mesh
+ Models/Core/UnitCylinder.mesh
+
+ true
-
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/CapturePoint/CapturePointNeutral.mesh
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/CapturePoint/CapturePointBlue.mesh
+
+
+
+
+
+
+
+
+
+ -15
+
+
+
+ 4
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/CapturePoint/CapturePointNeutral.mesh
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Props/CapturePoint/CapturePointRed.mesh
+
+
+
+
+
+
+
+
+
+ 15
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitCylinder.mesh
+
+ true
+
+
+
+
@@ -8821,7 +8811,7 @@
-
+
@@ -8859,7 +8849,7 @@
Textures/Core/UnitHexagon.png
-
+
@@ -8868,20 +8858,53 @@
+
+
+
2
-
- 1
-
-
Textures/Core/UnitHexagon_Rotated.png
-
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
@@ -8903,12 +8926,12 @@
+
+
+
3
-
-
-
Textures/Core/UnitHexagon_Rotated.png
@@ -8923,76 +8946,6 @@
-
-
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
- 4
-
-
- 1
-
-
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
- 1
-
-
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
@@ -9007,11 +8960,11 @@
-
1
+
Textures/Core/UnitHexagon_Rotated.png
@@ -9026,6 +8979,41 @@
+
+
+
+ Textures/Core/UnitHexagon.png
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ 4
+
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/CapturePoint.xml b/resources/Schema/Entities/CapturePoint.xml
index 9f33c4de..35c89e3e 100644
--- a/resources/Schema/Entities/CapturePoint.xml
+++ b/resources/Schema/Entities/CapturePoint.xml
@@ -4,14 +4,39 @@
-
- Models/Core/UnitSphere.mesh
-
-
+
-
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/PlayerHUD.xml b/resources/Schema/Entities/PlayerHUD.xml
index e3e9165b..cf07bc56 100644
--- a/resources/Schema/Entities/PlayerHUD.xml
+++ b/resources/Schema/Entities/PlayerHUD.xml
@@ -31,116 +31,6 @@
-
-
-
-
-
-
-
-
- 1
-
-
-
-
- Textures/HUD/HealthHudTriMain.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/White.png
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/White.png
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/White.png
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
- 100/100
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -154,40 +44,7 @@
Textures/Core/UnitHexagon.png
-
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
- Textures/Core/UnitHexagon_Rotated.png
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Textures/Core/UnitHexagon.png
-
+ false
@@ -197,15 +54,16 @@
-
- 3
-
+
+ 3
+
Textures/Core/UnitHexagon_Rotated.png
+ false
@@ -222,6 +80,7 @@
Textures/Core/UnitHexagon.png
+ false
@@ -231,16 +90,17 @@
-
- 4
-
1
+
+ 4
+
Textures/Core/UnitHexagon_Rotated.png
+ false
@@ -257,6 +117,43 @@
Textures/Core/UnitHexagon.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+ Textures/Core/UnitHexagon_Rotated.png
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Core/UnitHexagon.png
+
+ false
@@ -266,15 +163,16 @@
-
- 1
-
+
+ 1
+
Textures/Core/UnitHexagon_Rotated.png
+ false
@@ -291,6 +189,7 @@
Textures/Core/UnitHexagon.png
+ false
@@ -300,14 +199,15 @@
-
1
+
Textures/Core/UnitHexagon_Rotated.png
+ false
@@ -377,23 +277,157 @@
-
-
- Models/Widgets/Arrows/Arrow5.mesh
-
+
+
+ Models/Widgets/Arrows/Arrow5.mesh
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+ 100/100
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+ Textures/HealthHUD3.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Icons/Boosts/Assault-01.png
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Icons/Boosts/Defender-01.png
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Icons/Boosts/Sniper-01.png
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures/Icons/Abilities/Superman-01.png
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Schema/Entities/aim_rays.xml b/resources/Schema/Entities/aim_rays.xml
index c8dac9a3..1d953bf1 100644
--- a/resources/Schema/Entities/aim_rays.xml
+++ b/resources/Schema/Entities/aim_rays.xml
@@ -92,15 +92,15 @@
-
-
- Schema/Entities/Player.xml
-
+
+
+ Schema/Entities/Player.xml
+
@@ -143,15 +143,15 @@
-
-
- Schema/Entities/Player.xml
-
+
+
+ Schema/Entities/Player.xml
+
@@ -209,24 +209,26 @@
+ -15
-
- Models\Core\UnitCube.mesh
-
-
+
+
+ Models\Core\UnitCube.mesh
+
+ true
+
-
@@ -234,25 +236,27 @@
+ 15
1
-
- Models\Core\UnitCube.mesh
-
-
+
+
+ Models\Core\UnitCube.mesh
+
+ true
+
-
diff --git a/resources/Schema/Entities/aim_rays_with_capturep.xml b/resources/Schema/Entities/aim_rays_with_capturep.xml
new file mode 100644
index 00000000..6aa3246a
--- /dev/null
+++ b/resources/Schema/Entities/aim_rays_with_capturep.xml
@@ -0,0 +1,336 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Schema/Entities/Player.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -15
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+ models/core/unitcube.mesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/Shaders/ForwardPlus.frag.glsl b/resources/Shaders/ForwardPlus.frag.glsl
index aa45d118..8f0f7deb 100644
--- a/resources/Shaders/ForwardPlus.frag.glsl
+++ b/resources/Shaders/ForwardPlus.frag.glsl
@@ -171,7 +171,7 @@ void main()
vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
- vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a;
+ vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
color_result = color_result * clamp(1/specularTexel.a, 0, 1) + reflectionTotal;
//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
diff --git a/resources/Shaders/ForwardPlusShieldCheck.frag.glsl b/resources/Shaders/ForwardPlusShieldCheck.frag.glsl
index 35db495b..5995facb 100644
--- a/resources/Shaders/ForwardPlusShieldCheck.frag.glsl
+++ b/resources/Shaders/ForwardPlusShieldCheck.frag.glsl
@@ -178,7 +178,7 @@ void main()
vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);
color_result = color_result * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
float specularResult = (specularTexel.r + specularTexel.g + specularTexel.b)/3.0;
- vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a;
+ vec4 reflectionTotal = reflectionColor * (1-specularTexel.a) * color_result.a * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel));
color_result = color_result * clamp(1/specularTexel.a, 0, 1) + reflectionTotal;
//vec4 color_result = (DiffuseColor + Input.ExplosionColor) * (totalLighting.Diffuse + (totalLighting.Specular * specularTexel)) * diffuseTexel * Color;
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index f81e0443..7ccfcd96 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -656,7 +656,8 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
|| childEntity.HasComponent("HealthPickup")
|| childEntity.HasComponent("AmmoPickup")
|| childEntity.HasComponent("ScoreScreen")
- || childEntity.FirstParentWithComponent("ScoreScreen").Valid();
+ || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+ || childEntity.FirstParentWithComponent("CapturePoint").Valid();
}
PlayerID Server::getPlayerIDFromEndpoint()
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 8f589e34..69a9ad57 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -137,20 +137,13 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
- m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel);
m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer);
m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer);
diff --git a/src/Game/Systems/AbilityCooldownHUDSystem.cpp b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
index ccb12a97..07461f95 100644
--- a/src/Game/Systems/AbilityCooldownHUDSystem.cpp
+++ b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
@@ -11,23 +11,72 @@ void AbilityCooldownHUDSystem::Update(double dt)
for (auto& abilityHUDC : *abilityHUDs) {
EntityWrapper entity = EntityWrapper(m_World, abilityHUDC.EntityID);
EntityWrapper abilityEntity = entity.FirstParentWithComponent("DashAbility");
- if (!abilityEntity.Valid())
- return;
- EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+ std::string abilityName = "";
- double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
- double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
+ if (!abilityEntity.Valid()) {
+ //If we dont have a dash ability on player, we check for Sprint ability
+ abilityEntity = entity.FirstParentWithComponent("SprintAbility");
- currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+ if (!abilityEntity.Valid()) {
+ //If we dont have a sprint ability on player, we check for shield ability
+ abilityEntity = entity.FirstParentWithComponent("ShieldAbility");
- if(cooldownTextEntity.Valid()) {
- if(cooldownTextEntity.HasComponent("Text"))
- {
- std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
+ if (!abilityEntity.Valid()) {
+ //If we dont have a shield ability, we return, since we cannot do anything.
+ 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";
+ }
+ }
+ } 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";
+ }
+ }
+ } 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";
}
}
+
+ EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+ //TODO: Fix so this track correctly for shield and sprint depending on how they work.
+ double maxAbilityCD, currentAbilityCD;
+
+ if (abilityName == "DashAbility") {
+ maxAbilityCD = (double)abilityEntity[abilityName]["CoolDownMaxTimer"];
+ currentAbilityCD = (double)abilityEntity[abilityName]["CoolDownTimer"];
+ currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+
+ if (cooldownTextEntity.Valid()) {
+ if (cooldownTextEntity.HasComponent("Text")) {
+ std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
+ }
+ }
+ }
+
+ if (abilityName == "ShieldAbility") {
+ maxAbilityCD = 0.0;
+ currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
+ }
+
+ if (abilityName == "SprintAbility") {
+ maxAbilityCD = 0.0;
+ currentAbilityCD = 1 - (bool)abilityEntity[abilityName]["Active"];
+ }
+
if (entity.HasComponent("Fill")) {
entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD;
}
+
+
+
}
}
diff --git a/src/Game/Systems/AmmoPickupSystem.cpp b/src/Game/Systems/AmmoPickupSystem.cpp
index 062efe94..e28c38ff 100644
--- a/src/Game/Systems/AmmoPickupSystem.cpp
+++ b/src/Game/Systems/AmmoPickupSystem.cpp
@@ -96,6 +96,7 @@ bool AmmoPickupSystem::OnAmmoPickup(Events::AmmoPickup & e)
}
currentAmmo = std::min(currentAmmo + e.AmmoGain, maxWeaponAmmo);
+
return false;
}
@@ -114,8 +115,11 @@ bool AmmoPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
}
void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
+ //trigger should be valid but if it isnt we just return (to avoid crash)
+ if (!trigger.Valid()) {
+ return;
+ }
int maxWeaponAmmo = (int)player["AssaultWeapon"]["MaxAmmo"];
- int& currentAmmo = (int)player["AssaultWeapon"]["Ammo"];
int ammoGiven = 0.01*(double)trigger["AmmoPickup"]["AmmoGain"] * maxWeaponAmmo;
Events::AmmoPickup ePlayerAmmoPickup;
@@ -123,9 +127,6 @@ void AmmoPickupSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger) {
ePlayerAmmoPickup.Player = player;
m_EventBroker->Publish(ePlayerAmmoPickup);
- //immediately give the player the ammo (on server)
- currentAmmo = std::min(currentAmmo + ammoGiven, maxWeaponAmmo);
-
//copy position, ammogain, respawntimer (twice since one of the values will be counted down to 0, the other will be set in the new object)
//we need to copy all values since each value can be different for each ammoPickup
m_ETriggerTouchVector.push_back({ (glm::vec3)trigger["Transform"]["Position"], trigger["AmmoPickup"]["AmmoGain"],
diff --git a/src/Game/Systems/CapturePointSystem.cpp b/src/Game/Systems/CapturePointSystem.cpp
index 0d6089c5..4647d1b7 100644
--- a/src/Game/Systems/CapturePointSystem.cpp
+++ b/src/Game/Systems/CapturePointSystem.cpp
@@ -69,6 +69,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
int ownedBy = teamComponent["Team"];
int redTeamPlayersStandingInside = 0;
int blueTeamPlayersStandingInside = 0;
+ //note: old color system
if (capturePointEntity.HasComponent("Model")) {
//Now sets team color to the capturepoint, or white if it is uncaptured.
capturePointEntity["Model"]["Color"] = ownedBy == blueTeam ? glm::vec4(0, 0.0f, 1, 0.3) : ownedBy == redTeam ? glm::vec4(1, 0.0f, 0, 0.3) : glm::vec4(1, 1, 1, 0.3);
@@ -102,7 +103,18 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
nextPossibleCapturePoint["Blue"] = i - 1;
}
}
+
if (m_RecentlyCapturedNeedNextCapturePointNow) {
+ //change what model is displaying (change all in case 2 capturepoints has been captured on the same frame)
+ for (int i = 0; i < m_NumberOfCapturePoints; i++) {
+ auto owner = (int)m_CapturePointNumberToEntityMap[i]["Team"]["Team"];
+ if (m_CapturePointNumberToEntityMap[i].FirstChildByName("Red").ID != EntityID_Invalid) {
+ (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Red")["Model"]["Visible"] = owner == redTeam ? true : false;
+ (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Blue")["Model"]["Visible"] = owner == blueTeam ? true : false;
+ (bool&)m_CapturePointNumberToEntityMap[i].FirstChildByName("Spectator")["Model"]["Visible"] = owner == spectatorTeam ? true : false;
+ }
+ }
+ //save the next cap points and publish the captured event
m_CapturedEvent.BlueTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Blue"]];
m_CapturedEvent.RedTeamNextCapturePoint = m_CapturePointNumberToEntityMap[nextPossibleCapturePoint["Red"]];
m_EventBroker->Publish(m_CapturedEvent);
diff --git a/src/Game/Systems/PickupSpawnSystem.cpp b/src/Game/Systems/PickupSpawnSystem.cpp
index 99da931f..b0efd696 100644
--- a/src/Game/Systems/PickupSpawnSystem.cpp
+++ b/src/Game/Systems/PickupSpawnSystem.cpp
@@ -83,6 +83,10 @@ bool PickupSpawnSystem::OnTriggerLeave(Events::TriggerLeave& e)
}
void PickupSpawnSystem::DoPickup(EntityWrapper &player, EntityWrapper &trigger)
{
+ //trigger should be valid but if it isnt we just return (to avoid crash)
+ if (!trigger.Valid()) {
+ return;
+ }
double healthGiven = 0.01*(double)trigger["HealthPickup"]["HealthGain"] * (double)player["Health"]["MaxHealth"];
//only the server will increase the players hp and set it in the next delta