Merge pull request #215 from DMagic1/release

Version 16.1
S-C-A-N · May 2, 2016 · 85561ef · 85561ef
2 parents 754b566 + 648df68
commit 85561ef
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -863,7 +863,7 @@ sneaky then they can of course be sneaky.
 
 [shield:jenkins-dev]: http://img.shields.io/jenkins/s/https/ksp.sarbian.com/jenkins/SCANsat-dev.svg
 [shield:jenkins-rel]: http://img.shields.io/jenkins/s/https/ksp.sarbian.com/jenkins/SCANsat-release.svg
-[shield:support-ksp]: http://img.shields.io/badge/for%20KSP-v1.1-bad455.svg
+[shield:support-ksp]: http://img.shields.io/badge/for%20KSP-v1.1.2-bad455.svg
 [shield:support-rpm]: http://img.shields.io/badge/works%20with%20RPM-v0.25.x-a31f34.svg
 [shield:support-mm]: http://img.shields.io/badge/works%20with%20MM-v2.6.x-40b7c0.svg
 [shield:support-toolbar]: http://img.shields.io/badge/works%20with%20Blizzy's%20Toolbar-1.7.x-7c69c0.svg
@@ -875,7 +875,7 @@ sneaky then they can of course be sneaky.
 [shield:support-ccfg]: https://img.shields.io/badge/works%20with%20Contract%20Configurator-1.9.x-yellowgreen.svg
 [shield:ckan]: https://img.shields.io/badge/CKAN-Indexed-brightgreen.svg
 [shield:support-mechjeb]: http://img.shields.io/badge/works%20with%20MechJeb-2.5.7-lightgrey.svg
-[shield:support-kopernicus]: http://img.shields.io/badge/works%20with%20Kopernicus-0.6.x-ff8c00.svg
+[shield:support-kopernicus]: http://img.shields.io/badge/works%20with%20Kopernicus-1.x-ff8c00.svg
 
 [shield:gittip-tg-img]: http://img.shields.io/gittip/technogeeky.png
 [shield:gittip-tg]: https://www.gittip.com/technogeeky/

diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
@@ -1,6 +1,6 @@
 {
      "NAME":"SCANsat",
-	 "URL":"https://raw.githubusercontent.com/S-C-A-N/SCANsat/dev/SCANassets/SCANsat.version",
+	 "URL":"https://raw.githubusercontent.com/S-C-A-N/SCANsat/release/SCANassets/SCANsat.version",
      "DOWNLOAD":"https://github.com/S-C-A-N/SCANsat/releases",
      "GITHUB":{
          "USERNAME":"S-C-A-N",
@@ -11,21 +11,21 @@
          "MAJOR":1,
          "MINOR":1,
          "PATCH":6,
-         "BUILD":0
+         "BUILD":1
      },
      "KSP_VERSION":{
          "MAJOR":1,
          "MINOR":1,
-         "PATCH":0
+         "PATCH":2
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
          "MINOR":1,
-         "PATCH":0
+         "PATCH":2
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
          "MINOR":1,
-         "PATCH":0
+         "PATCH":2
      }
 }
diff --git a/SCANmechjeb/Properties/AssemblyInfo.cs b/SCANmechjeb/Properties/AssemblyInfo.cs
@@ -32,9 +32,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
-[assembly: AssemblyInformationalVersion ("v16.0")]
+[assembly: AssemblyVersion("1.6.0.1")]
+[assembly: AssemblyFileVersion("1.6.0.1")]
+[assembly: AssemblyInformationalVersion ("v16.1")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
@@ -1,11 +1,19 @@
-Versoin 16.0 - 2016-4-29
+Version 16.1 - 2016-5-2
+------------------------
+
+- Update for KSP 1.1.2
+
+- Update API for Kerbalism support
+- Fixed an error that prevented the UI from opening after exiting the Mission Control building
+
+Version 16.0 - 2016-4-19
 ------------------------
 
 - Update for KSP 1.1 final release
 - Update for MechJeb 2.5.7
 
 - KSPedia Entry
-	- 17 New KSPedia pages covering SCANsat basics and features
+    - 17 New KSPedia pages covering SCANsat basics and features
 
 - Add science experiment for low resolution resource scan (M700 scanner)
     - Adjust other science reward amounts

diff --git a/SCANsat/Properties/AssemblyInfo.cs b/SCANsat/Properties/AssemblyInfo.cs
@@ -14,9 +14,9 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion ("1.6.0.0")]
-[assembly: AssemblyFileVersion ("1.6.0.6")]
-[assembly: AssemblyInformationalVersion ("v16.0")]
+[assembly: AssemblyVersion ("1.6.0.1")]
+[assembly: AssemblyFileVersion ("1.6.0.1")]
+[assembly: AssemblyInformationalVersion ("v16.1")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 6)]
 

diff --git a/SCANsat/SCANcontroller.cs b/SCANsat/SCANcontroller.cs
@@ -903,7 +903,7 @@ private void Start()
 			GameEvents.onShowUI.Add(UIOn);
 			GameEvents.onHideUI.Add(UIOff);
 			GameEvents.onGUIMissionControlSpawn.Add(UIOff);
-			GameEvents.onGUIMissionControlDespawn.Add(UIOff);
+			GameEvents.onGUIMissionControlDespawn.Add(UIOn);
 			GameEvents.onGUIRnDComplexSpawn.Add(UIOff);
 			GameEvents.onGUIRnDComplexDespawn.Add(UIOn);
 			GameEvents.onGUIAdministrationFacilitySpawn.Add(UIOff);
@@ -1117,7 +1117,7 @@ private void OnDestroy()
 			GameEvents.onShowUI.Remove(UIOn);
 			GameEvents.onHideUI.Remove(UIOff);
 			GameEvents.onGUIMissionControlSpawn.Remove(UIOff);
-			GameEvents.onGUIMissionControlDespawn.Remove(UIOff);
+			GameEvents.onGUIMissionControlDespawn.Remove(UIOn);
 			GameEvents.onGUIRnDComplexSpawn.Remove(UIOff);
 			GameEvents.onGUIRnDComplexDespawn.Remove(UIOn);
 			GameEvents.onGUIAdministrationFacilitySpawn.Remove(UIOff);

diff --git a/SCANsat/SCANutil.cs b/SCANsat/SCANutil.cs
@@ -200,10 +200,10 @@ public static bool registerSensorExternal(Vessel v, ProtoPartModuleSnapshot m, P
 			if (prefab == null)
 				return false;
 
-			if (!prefab.Modules.Contains<SCANsat.SCAN_PartModules.SCANsat>() || !prefab.Modules.Contains<ModuleSCANresourceScanner>())
+			if (!(prefab.Modules.Contains<SCANsat.SCAN_PartModules.SCANsat>() || prefab.Modules.Contains<ModuleSCANresourceScanner>()))
 				return false;
 
-			if (m.moduleName != "SCANsat" || m.moduleName != "ModuleSCANresourceScanner")
+			if (!(m.moduleName == "SCANsat" || m.moduleName == "ModuleSCANresourceScanner"))
 				return false;
 
 			if (SCANcontroller.controller == null)
@@ -240,10 +240,10 @@ public static bool unregisterSensorExternal(Vessel v, ProtoPartModuleSnapshot m,
 			if (prefab == null)
 				return false;
 
-			if (!prefab.Modules.Contains<SCANsat.SCAN_PartModules.SCANsat>() || !prefab.Modules.Contains<ModuleSCANresourceScanner>())
+			if (!(prefab.Modules.Contains<SCANsat.SCAN_PartModules.SCANsat>() || prefab.Modules.Contains<ModuleSCANresourceScanner>()))
 				return false;
 
-			if (m.moduleName != "SCANsat" || m.moduleName != "ModuleSCANresourceScanner")
+			if (!(m.moduleName == "SCANsat" || m.moduleName == "ModuleSCANresourceScanner"))
 				return false;
 
 			if (SCANcontroller.controller == null)