Merge branch 'development'

allista · Jul 5, 2020 · 71fc0ad · 71fc0ad
2 parents 6234495 + 2cbe53c
commit 71fc0ad
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,7 +3,11 @@ _You may keep the Hangar.user (if you have one) and config.xml files to preserve
 
 ***
 
-* **v3.6.0**
+* **v3.6.0.1**
+    * Compatible with KSP 1.10
+    * Fixed solr panel config of the Small Ground Hangar
+
+* v3.6.0
     * **Fairings**
         * Added **Jettison Power** PAW control to be able to change
         both jettison force, torque and launch velocity of the payload

diff --git a/GameData/Hangar/Hangar.version b/GameData/Hangar/Hangar.version
@@ -8,7 +8,7 @@
          "MAJOR":3,
          "MINOR":6,
          "PATCH":0,
-         "BUILD":0
+         "BUILD":1
      },
     "KSP_VERSION_MIN":
      {
@@ -19,7 +19,7 @@
     "KSP_VERSION_MAX":
      {
          "MAJOR":1,
-         "MINOR":9,
-         "PATCH":1
+         "MINOR":10,
+         "PATCH":0
      }
 }
diff --git a/GameData/Hangar/Parts/SmallHangar.cfg b/GameData/Hangar/Parts/SmallHangar.cfg
@@ -159,10 +159,11 @@ PART {
         impactResistance = 15
         sunTracking = false
         isBreakable = false
+        useAnimation = false
         panelDrag = 0
         panelMass = 0
 
-        raycastTransformName = suncatcher
+        secondaryTransformName = suncatcher
         pivotName = suncatcher
 
         resourceName = ElectricCharge

diff --git a/Source/Hangar.csproj b/Source/Hangar.csproj
@@ -108,59 +108,59 @@
     </ItemGroup>
     <ItemGroup>
         <Reference Include="Assembly-CSharp">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Assembly-CSharp-firstpass">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="KSPAssets">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\KSPAssets.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\KSPAssets.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Cecil">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Cecil.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="Mono.Security">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\Mono.Security.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\Mono.Security.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Core">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.Core.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Core.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="System.Xml">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\System.Xml.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\System.Xml.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\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.9.1\KSP_Data\Managed\UnityEngine.AudioModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\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.9.1\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\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.9.1\KSP_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\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.9.1\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\KSP_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="UnityEngine.UI">
-            <HintPath>..\..\KSP-test\KSP_test_1.9.1\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+            <HintPath>..\..\KSP-test\KSP_test_1.10.0\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.0")]
+[assembly: AssemblyVersion("3.6.0.1")]
 #endif
 [assembly: KSPAssembly("Hangar", 3, 6)]
 
@@ -40,7 +40,7 @@ public class ModInfo : KSP_AVC_Info
         public ModInfo()
         {
             MinKSPVersion = new Version(1, 9, 0);
-            MaxKSPVersion = new Version(1, 9, 1);
+            MaxKSPVersion = new Version(1, 10, 0);
 
             VersionURL = "https://raw.githubusercontent.com/allista/hangar/master/GameData/Hangar/Hangar.version";
             UpgradeURL = "https://spacedock.info/mod/1000/Hangar";