diff --git a/assets b/assets
index 504752c9..6ffc1ab8 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 504752c94966c432513cac35acf906f8c9a3f965
+Subproject commit 6ffc1ab82aa36a933b84b9eb4d50e013e9ad9911
diff --git a/resources/Schema/Entities/OverwatchCamera.xml b/resources/Schema/Entities/OverwatchCamera.xml
index 92540e5b..6694121e 100644
--- a/resources/Schema/Entities/OverwatchCamera.xml
+++ b/resources/Schema/Entities/OverwatchCamera.xml
@@ -3,12 +3,12 @@
- 0.049999997019767761
+ 0.014999999664723873
-
-
+
+
@@ -16,188 +16,1139 @@
-
+
-
+
-
+
-
+
-
+
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Classes/Assault-01.png
-
- PickClass
+ PickTeam
1
-
-
+
-
+
-
- Assault
- Fonts/DroidSans.ttf,64
-
-
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 1
+
-
-
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Assault/AssaultBluePose.mesh
+ false
+
+
+
+
+
+
+
+
+
+
+
+ AssaultPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Blue/AssaultWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \1
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Assault
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Speed Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \1
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \4
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dash
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/Superman-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Shoe-01.png
+
+
+
+
+
+
+
+
+
+
+
+ x2 Jump
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Classes/Defender-01.png
-
- PickClass
- 2
+ PickTeam
+ 1
-
-
-
-
+
-
+
-
- Defender
- Fonts/DroidSans.ttf,64
-
-
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 2
+
-
-
+
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Icons/Classes/Sniper-01.png
-
-
- PickClass
- 3
-
-
-
-
-
-
-
-
+
-
- Sniper
- Fonts/DroidSans.ttf,64
-
-
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Defender/DefenderBluePose.mesh
+ false
+
-
-
+
+
+
-
+
+
+
+
+ DefenderPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Blue/DefenderWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \2
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Defender
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 150
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Shield Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \2
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \5
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Personal Shield
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/SheildDots-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
- Pick Class
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
- SwapToTeamPick
+ PickTeam
1
-
-
+
-
+
-
- Change
- Fonts/DroidSans.ttf,64
-
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 3
+
-
-
+
-
+
-
- Team
- Fonts/DroidSans.ttf,64
-
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Sniper/SniperBluePose.mesh
+ false
+
-
-
+
+
+
-
+
+
+
+
+ SniperPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Blue/SecondaryWeaponBlue.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \3
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Sniper
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Accuracy Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \3
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \6
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sprint
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/Dash-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -214,53 +1165,119 @@
-
+
-
+
-
- Pick Team
- Fonts/DroidSans.ttf,64
-
-
-
-
-
-
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
- PickTeam
- 1
-
-
-
-
+
-
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ PickTeam
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
- Spectator
+ Blue
Fonts/DroidSans.ttf,64
+
+
+
-
-
+
+
@@ -269,123 +1286,228 @@
-
-
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
- true
-
-
- PickTeam
- 2
-
-
-
+
-
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ PickTeam
+ 2
+
+
+
+
+
+
+
+
Red
Fonts/DroidSans.ttf,64
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
- true
-
-
- PickTeam
- 3
-
-
-
+
-
+
-
- Blue
- Fonts/DroidSans.ttf,64
-
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ PickTeam
+ 1
+
-
-
+
-
-
-
-
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
- false
-
-
- SwapToClassPick
- 1
-
-
-
-
-
-
-
-
+
- Change
+ Spectator
Fonts/DroidSans.ttf,64
- false
-
-
+
+
-
+
-
- Class
- Fonts/DroidSans.ttf,64
- false
-
-
-
-
-
+
-
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
@@ -483,6 +1605,7 @@
+ 1
@@ -559,8 +1682,7 @@
- 0.10332605343919568
-
+
1
@@ -573,7 +1695,7 @@
-
+
@@ -598,7 +1720,8 @@
-
+ 1
+
@@ -609,7 +1732,7 @@
-
+
@@ -619,100 +1742,1316 @@
-
+
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
-
- SwapToTeamPick
- 1
-
-
-
+
-
+
-
- Change
- Fonts/DroidSans.ttf,64
-
-
-
+
-
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ SwapToTeamPick
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Change Team
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
- Team
- Fonts/DroidSans.ttf,64
-
-
-
+
-
+
+
+
+
+
+ false
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+ true
+
+
+
+ SwapToClassPick
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Change Class
+ Fonts/DroidSans.ttf,64
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- false
- Models/Core/UnitQuad.mesh
-
- Textures/Core/UnitHexagon.png
-
-
- SwapToClassPick
+ PickTeam
1
-
-
+
-
+
-
- Change
- Fonts/DroidSans.ttf,64
-
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 1
+
-
-
+
-
+
-
- Class
- Fonts/DroidSans.ttf,64
-
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Assault/AssaultRedPose.mesh
+ false
+
-
-
+
+
+
+
+
+
+
+
+
+ AssaultPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Red/AssaultWeaponRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \1
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Assault
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Speed Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \1
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \4
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dash
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/Superman-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Shoe-01.png
+
+
+
+
+
+
+
+
+
+
+
+ x2 Jump
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PickTeam
+ 1
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 2
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Defender/DefenderRedPose.mesh
+ false
+
+
+
+
+
+
+
+
+
+
+
+ DefenderPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Red/DefenderWeaponRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \2
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Defender
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 150
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Shield Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \2
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \5
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Personal Shield
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/SheildDots-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PickTeam
+ 1
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Core/White.png
+
+
+
+ PickClass
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/HUD/ButtonCorner_16.png
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blend
+
+
+
+ 1.6000000238418579
+ Models/Characters/Sniper/SniperRedPose.mesh
+ false
+
+
+
+
+
+
+
+
+
+
+
+ SniperPoseF
+
+ true
+
+
+
+
+
+
+
+
+ R_Arm_Weapon_Joint
+
+
+ Models/Weapons/Red/SecondaryWeaponRed.mesh
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitSphere.mesh
+ false
+
+
+ 0.30000001192092896
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \3
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+ Sniper
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 100
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Team Accuracy Boost
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \3
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \6
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \7
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sprint
+ Fonts/Hind-Edited.otf,64
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Models/Core/UnitQuad.mesh
+
+ Textures/Icons/Abilities/Square/Dash-01.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Game/Systems/SpectatorCameraSystem.cpp b/src/Game/Systems/SpectatorCameraSystem.cpp
index 23dfb164..59f41a8f 100644
--- a/src/Game/Systems/SpectatorCameraSystem.cpp
+++ b/src/Game/Systems/SpectatorCameraSystem.cpp
@@ -52,7 +52,11 @@ bool SpectatorCameraSystem::OnInputCommand(const Events::InputCommand& e)
// TODO: 1 Signifies spectator, should probably have real enum here later.
// Spectators should never end up at the class select, instead put them at the SpectatorCamera.
if (swapToClass && m_PickedTeam != 1) {
- camName = "PickClassCamera";
+ if (m_PickedTeam == 2) {
+ camName = "PickClassCameraRed";
+ } else if (m_PickedTeam == 3) {
+ camName = "PickClassCameraBlue";
+ }
} else if (e.Command == "SwapToTeamPick") {
camName = "PickTeamCamera";
} else {