Update Solution and Prepare Build for 1.5

X2CommunityCore · Aug 28, 2017 · 5081aad · 5081aad
1 parent b0c1b68
commit 5081aad
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/X2CommunityHighlander.XCOM_sln b/X2CommunityHighlander.XCOM_sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # XCOM ModBuddy Solution File, Format Version 11.00
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "X2CommunityHighlander", "X2CommunityHighlander\X2CommunityHighlander.x2proj", "{6671DE85-5595-469A-9B54-28A003DEFE77}"
+Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "X2CommunityHighlander", "X2CommunityHighlander\X2CommunityHighlander.x2proj", "{BC23D489-6DEA-4FB0-A311-6609D933131C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|XCOM 2 = Debug|XCOM 2
 		Default|XCOM 2 = Default|XCOM 2
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6671DE85-5595-469A-9B54-28A003DEFE77}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2
-		{6671DE85-5595-469A-9B54-28A003DEFE77}.Debug|XCOM 2.Build.0 = Debug|XCOM 2
-		{6671DE85-5595-469A-9B54-28A003DEFE77}.Default|XCOM 2.ActiveCfg = Debug|XCOM 2
-		{6671DE85-5595-469A-9B54-28A003DEFE77}.Default|XCOM 2.Build.0 = Debug|XCOM 2
+		{BC23D489-6DEA-4FB0-A311-6609D933131C}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2
+		{BC23D489-6DEA-4FB0-A311-6609D933131C}.Debug|XCOM 2.Build.0 = Debug|XCOM 2
+		{BC23D489-6DEA-4FB0-A311-6609D933131C}.Default|XCOM 2.ActiveCfg = Debug|XCOM 2
+		{BC23D489-6DEA-4FB0-A311-6609D933131C}.Default|XCOM 2.Build.0 = Debug|XCOM 2
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/X2CommunityHighlander/Src/XComGame/Classes/UISoldierHeader.uc b/X2CommunityHighlander/Src/XComGame/Classes/UISoldierHeader.uc
@@ -72,7 +72,7 @@ public function PositionTopRight()
 public function PopulateData(optional XComGameState_Unit Unit, optional StateObjectReference NewItem, optional StateObjectReference ReplacedItem, optional XComGameState NewCheckGameState)
 {
 	local int iRank, WillBonus, AimBonus, HealthBonus, MobilityBonus, TechBonus, PsiBonus, ArmorBonus, DodgeBonus;
-	local string classIcon, rankIcon, flagIcon, Will, Aim, Health, Mobility, Tech, Psi, Armor, Dodge
+	local string classIcon, rankIcon, flagIcon, Will, Aim, Health, Mobility, Tech, Psi, Armor, Dodge;
 	local X2SoldierClassTemplate SoldierClass;
 	local X2EquipmentTemplate EquipmentTemplate;
 	local XComGameState_Item TmpItem;

diff --git a/X2CommunityHighlander/X2CommunityHighlander.x2proj b/X2CommunityHighlander/X2CommunityHighlander.x2proj
@@ -285,12 +285,18 @@
     <Content Include="Src\XComGame\Classes\UIViewObjectives.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2Ability.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2AbilityTemplate.uc">
       <SubType>Content</SubType>
     </Content>
     <Content Include="Src\XComGame\Classes\X2AbilityToHitCalc.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2AbilityToHitCalc_Hacking.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2Ability_DefaultAbilitySet.uc">
       <SubType>Content</SubType>
     </Content>
@@ -315,6 +321,9 @@
     <Content Include="Src\XComGame\Classes\X2Action_ExitCover.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2Action_Grapple.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2AIBTBehaviorTree.uc">
       <SubType>Content</SubType>
     </Content>
@@ -357,6 +366,9 @@
     <Content Include="Src\XComGame\Classes\X2Effect_PersistentStatChange.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2Effect_Reaper.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2Effect_Shredder.uc">
       <SubType>Content</SubType>
     </Content>
@@ -387,9 +399,18 @@
     <Content Include="Src\XComGame\Classes\X2StrategyElement_DefaultMissionSources.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2StrategyGameRuleset.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2TacticalGameRuleset.uc">
       <SubType>Content</SubType>
     </Content>
+    <Content Include="Src\XComGame\Classes\X2TacticalGameRulesetDataStructures.uc">
+      <SubType>Content</SubType>
+    </Content>
+    <Content Include="Src\XComGame\Classes\X2TacticalGameRuleset_MovementObserver.uc">
+      <SubType>Content</SubType>
+    </Content>
     <Content Include="Src\XComGame\Classes\X2TargetingMethod_EvacZone.uc">
       <SubType>Content</SubType>
     </Content>