Merged development branch

allista · Feb 18, 2022 · 67643a7 · 67643a7
2 parents 111e5eb + 245bc9a
commit 67643a7
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,4 @@ Assembly-CSharp*
 **/UserPrefs.xml
 Hangar.sln
 Packages/manifest.json
+/GameData/Hangar/Parts/@thumbs
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,7 +3,10 @@ _You may keep the Hangar.user (if you have one) and config.xml files to preserve
 
 ***
 
-* **v3.6.2**
+* **v3.6.2.1**
+    * KSP: 1.11.1
+
+* v3.6.2
     * Improved Procedural Adapter behaviour in Editor
     * Fixed lag in Editor when opening PAW of hangars in symmetry group
 

diff --git a/GameData/Hangar/Hangar.version b/GameData/Hangar/Hangar.version
@@ -8,18 +8,18 @@
          "MAJOR":3,
          "MINOR":6,
          "PATCH":2,
-         "BUILD":0
+         "BUILD":1
      },
     "KSP_VERSION_MIN":
      {
          "MAJOR":1,
-         "MINOR":9,
-         "PATCH":0
+         "MINOR":11,
+         "PATCH":1
      },
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":10,
-         "PATCH":0
+         "MINOR":11,
+         "PATCH":1
      }
 }
diff --git a/Source/AuxModules/ProceduralAdapter.cs b/Source/AuxModules/ProceduralAdapter.cs
@@ -29,8 +29,8 @@ public class HangarProceduralAdapter : AnisotropicResizableBase
 
         void update_and_break_struts()
         {
-            UpdateMesh(); 
-            part.BreakConnectedCompoundParts();
+            using(part.ReconnectCompoundParts())
+                UpdateMesh(); 
         }
 
         protected override void on_aspect_changed() => update_and_break_struts();
@@ -96,7 +96,7 @@ protected override void update_orig_mass_and_cost()
             orig_cost = cone.Area * AreaCost;
         }
 
-        public override void SaveDefaults()
+        protected override void SaveDefaults()
         {
             old_size = size;
             base.SaveDefaults();

diff --git a/Source/Hangar.csproj b/Source/Hangar.csproj
@@ -15,7 +15,7 @@
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>..\GameData\Hangar\Plugins</OutputPath>
-        <DefineConstants>DEBUG;</DefineConstants>
+        <DefineConstants>DEBUG;NIGHTBUILD</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <ConsolePause>false</ConsolePause>
@@ -36,48 +36,48 @@
         <DefineConstants>NIGHTBUILD</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <Compile Include="HangarVesselModule.cs"/>
-        <Compile Include="VesselsPack.cs"/>
-        <Compile Include="VesselWrappers.cs"/>
-        <Compile Include="HangarGenericInflatable.cs"/>
-        <Compile Include="HangarPassage.cs"/>
-        <Compile Include="HangarStorage.cs"/>
-        <Compile Include="HangarMachinery.cs"/>
-        <Compile Include="HangarMachineryEditor.cs"/>
-        <Compile Include="Hangar.cs"/>
-        <Compile Include="AsteroidHangars\AsteroidMassConverter.cs"/>
-        <Compile Include="HangarGateway.cs"/>
-        <Compile Include="AsteroidHangars\HangarStorageDynamic.cs"/>
-        <Compile Include="Utils\Extensions.cs"/>
-        <Compile Include="Utils\HangarGUI.cs"/>
-        <Compile Include="GUI\HangarWindow.cs"/>
-        <Compile Include="GUI\VesselTransferWindow.cs"/>
-        <Compile Include="AuxModules\ProceduralAdapter.cs"/>
-        <Compile Include="AuxModules\TruncatedCone.cs"/>
-        <Compile Include="HangarContract.cs"/>
-        <Compile Include="LimitedHangarStorage.cs"/>
-        <Compile Include="HangarFairings.cs"/>
-        <Compile Include="Utils\HangarConfig.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-        <Compile Include="Debris.cs"/>
-        <Compile Include="GUI\HangarAppToolbar.cs"/>
-        <Compile Include="AsteroidHangars\SingleUseGrappleNode.cs"/>
-        <Compile Include="GUI\HangarFilterManager.cs"/>
+        <Compile Include="HangarVesselModule.cs" />
+        <Compile Include="VesselsPack.cs" />
+        <Compile Include="VesselWrappers.cs" />
+        <Compile Include="HangarGenericInflatable.cs" />
+        <Compile Include="HangarPassage.cs" />
+        <Compile Include="HangarStorage.cs" />
+        <Compile Include="HangarMachinery.cs" />
+        <Compile Include="HangarMachineryEditor.cs" />
+        <Compile Include="Hangar.cs" />
+        <Compile Include="AsteroidHangars\AsteroidMassConverter.cs" />
+        <Compile Include="HangarGateway.cs" />
+        <Compile Include="AsteroidHangars\HangarStorageDynamic.cs" />
+        <Compile Include="Utils\Extensions.cs" />
+        <Compile Include="Utils\HangarGUI.cs" />
+        <Compile Include="GUI\HangarWindow.cs" />
+        <Compile Include="GUI\VesselTransferWindow.cs" />
+        <Compile Include="AuxModules\ProceduralAdapter.cs" />
+        <Compile Include="AuxModules\TruncatedCone.cs" />
+        <Compile Include="HangarContract.cs" />
+        <Compile Include="LimitedHangarStorage.cs" />
+        <Compile Include="HangarFairings.cs" />
+        <Compile Include="Utils\HangarConfig.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+        <Compile Include="Debris.cs" />
+        <Compile Include="GUI\HangarAppToolbar.cs" />
+        <Compile Include="AsteroidHangars\SingleUseGrappleNode.cs" />
+        <Compile Include="GUI\HangarFilterManager.cs" />
     </ItemGroup>
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
+    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
     <ProjectExtensions>
         <MonoDevelop>
             <Properties>
-                <Deployment.LinuxDeployData generatePcFile="False"/>
+                <Deployment.LinuxDeployData generatePcFile="False" />
             </Properties>
         </MonoDevelop>
     </ProjectExtensions>
     <ItemGroup>
-        <Folder Include="AsteroidHangars\"/>
-        <Folder Include="Utils\"/>
-        <Folder Include="GUI\"/>
-        <Folder Include="AuxModules\"/>
-        <Folder Include="Properties\"/>
+        <Folder Include="AsteroidHangars\" />
+        <Folder Include="Utils\" />
+        <Folder Include="GUI\" />
+        <Folder Include="AuxModules\" />
+        <Folder Include="Properties\" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\AT_Utils\AT_Utils.csproj">
@@ -113,59 +113,59 @@
     </ItemGroup>
     <ItemGroup>
         <Reference Include="Assembly-CSharp">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Assembly-CSharp-firstpass">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="KSPAssets">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\KSPAssets.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\KSPAssets.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Cecil">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Security">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Security.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\Mono.Security.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Core">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Core.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Core.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Xml">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Xml.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\System.Xml.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.UI">
-            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.11.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 #if NIGHTBUILD
 [assembly: AssemblyVersion("3.6.*")]
 #else
-[assembly: AssemblyVersion("3.6.2")]
+[assembly: AssemblyVersion("3.6.2.1")]
 #endif
 [assembly: KSPAssembly("Hangar", 3, 6)]
 
@@ -39,8 +39,8 @@ public class ModInfo : KSP_AVC_Info
     {
         public ModInfo()
         {
-            MinKSPVersion = new Version(1, 9, 0);
-            MaxKSPVersion = new Version(1, 10, 0);
+            MinKSPVersion = new Version(1, 11, 1);
+            MaxKSPVersion = new Version(1, 11, 1);
 
             VersionURL = "https://raw.githubusercontent.com/allista/hangar/master/GameData/Hangar/Hangar.version";
             UpgradeURL = "https://spacedock.info/mod/1000/Hangar";

diff --git a/Source/VesselWrappers.cs b/Source/VesselWrappers.cs
@@ -34,7 +34,7 @@ public void UpdateMetric()
         { 
             if(construct == null) return;
             if(construct.parts.Count == 0) return;
-            //sort parts from root to leavs
+            //sort parts from root to leaves
             var parts = construct.parts[0].AllConnectedParts();
             metric = new Metric(parts, true); 
         }

diff --git a/make-nightbuild.sh b/make-nightbuild.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname "$0")
 
-../../PyKSPutils/make_mod_release  -s 'Source' \
+make_mod_release  -s 'Source' \
 -e '*/ForModders/*' '*/config.xml' '*.user' '*.orig' \
 'GameData/000_AT_Utils/Plugins/AnimatedConverters.dll' \
 'GameData/ConfigurableContainers/Parts/*' \

diff --git a/make-release.sh b/make-release.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-cd $(dirname "$0")
+CWD=$(dirname "$0")
+cd "${CWD}" || exit
 
-../../PyKSPutils/make_mod_release  -s 'Source' \
--e '*/ForModders/*' '*/config.xml' '*.user' '*.orig' '*.mdb' '*.pdb' \
-'*/System.*.dll' '*/Mono.*.dll' '*/Unity*.dll' \
-'GameData/000_AT_Utils/Plugins/AnimatedConverters.dll' \
-'GameData/000_AT_Utils/Plugins/SubmodelResizer.dll' \
-'GameData/ConfigurableContainers/Parts/*' \
-'GameData/000_AT_Utils/ResourceHack.cfg' \
--i '../AT_Utils/GameData' '../AT_Utils/ConfigurableContainers/GameData'
+make_mod_release -s 'Source' \
+    -e '*/ForModders/*' '*/config.xml' '*.user' '*.orig' '*.mdb' '*.pdb' \
+    '*/System.*.dll' '*/Mono.*.dll' '*/Unity*.dll' \
+    'GameData/000_AT_Utils/Plugins/AnimatedConverters.dll' \
+    'GameData/000_AT_Utils/Plugins/SubmodelResizer.dll' \
+    'GameData/ConfigurableContainers/Parts/*' \
+    'GameData/000_AT_Utils/ResourceHack.cfg' \
+    -i '../AT_Utils/GameData' '../AT_Utils/ConfigurableContainers/GameData'