Merge pull request #236 from DMagic1/dev

Version 16.7 for KSP 1.2
S-C-A-N · Sep 14, 2016 · 842bcb5 · 842bcb5
2 parents dc84749 + 58eddd4
commit 842bcb5
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 39 deletions.
diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version
@@ -1,31 +1,31 @@
 {
      "NAME":"SCANsat",
-	 "URL":"https://raw.githubusercontent.com/S-C-A-N/SCANsat/release/SCANassets/SCANsat.version",
+	 "URL":"https://raw.githubusercontent.com/S-C-A-N/SCANsat/dev/SCANassets/SCANsat.version",
      "DOWNLOAD":"https://github.com/S-C-A-N/SCANsat/releases",
      "GITHUB":{
          "USERNAME":"S-C-A-N",
          "REPOSITORY":"SCANsat",
-         "ALLOW_PRE_RELEASE":false
+         "ALLOW_PRE_RELEASE":true
      },
      "VERSION":{
          "MAJOR":1,
          "MINOR":1,
          "PATCH":6,
-         "BUILD":6
+         "BUILD":7
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":1,
-         "PATCH":3
+         "MINOR":2,
+         "PATCH":0
      }
 }
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.6")]
-[assembly: AssemblyFileVersion("1.6.0.6")]
-[assembly: AssemblyInformationalVersion ("v16.6")]
+[assembly: AssemblyVersion("1.6.0.7")]
+[assembly: AssemblyFileVersion("1.6.0.7")]
+[assembly: AssemblyInformationalVersion ("v16.7")]
 
 [assembly: KSPAssembly ("SCANmechjeb", 0, 4)]
 [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)]

diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Version 16.7 - 2016-9-13
+-----------------------
+
+- Update for KSP 1.2
+
 Version 16.6 - 2016-8-18
 -----------------------
 

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.6")]
-[assembly: AssemblyFileVersion ("1.6.0.6")]
-[assembly: AssemblyInformationalVersion ("v16.6")]
+[assembly: AssemblyVersion ("1.6.0.7")]
+[assembly: AssemblyFileVersion ("1.6.0.7")]
+[assembly: AssemblyInformationalVersion ("v16.7")]
 
 [assembly: KSPAssembly ("SCANsat", 1, 6)]
 

diff --git a/SCANsat/SCAN_PartModules/SCANhiDefCamera.cs b/SCANsat/SCAN_PartModules/SCANhiDefCamera.cs
@@ -28,7 +28,7 @@ public class SCANhiDefCamera : PartModule, IAnimatedModule
 		[KSPField]
 		public bool hiDetailOnly;
 
-		private List<ModuleHighDefCamera> stockCameras;
+		//private List<ModuleHighDefCamera> stockCameras;
 
 		private bool activated;
 		private bool refreshState;
@@ -43,7 +43,7 @@ public override void OnStart(PartModule.StartState state)
 			activated = true;
 			refreshState = true;
 
-			stockCameras = findCameras();
+			//stockCameras = findCameras();
 
 			minZoom = clampValue(minZoom, 1, 10);
 			maxZoom = clampValue(maxZoom, 10, 1000);
@@ -57,10 +57,10 @@ private void OnDestroy()
 			Events["resetCenter"].active = false;
 		}
 
-		private List<ModuleHighDefCamera> findCameras()
-		{
-			return part.FindModulesImplementing<ModuleHighDefCamera>().ToList();
-		}
+		//private List<ModuleHighDefCamera> findCameras()
+		//{
+		//	return part.FindModulesImplementing<ModuleHighDefCamera>().ToList();
+		//}
 
 		private float clampValue (float value, float min, float max)
 		{
@@ -126,24 +126,24 @@ public void resetCenter()
 
 		private void enableConnectedModules()
 		{
-			if (stockCameras != null)
-			{
-				foreach (ModuleHighDefCamera m in stockCameras)
-				{
-					m.EnableModule();
-				}
-			}
+			//if (stockCameras != null)
+			//{
+			//	foreach (ModuleHighDefCamera m in stockCameras)
+			//	{
+			//		m.EnableModule();
+			//	}
+			//}
 		}
 
 		private void disableConnectedModules()
 		{
-			if (stockCameras != null)
-			{
-				foreach (ModuleHighDefCamera m in stockCameras)
-				{
-					m.DisableModule();
-				}
-			}
+			//if (stockCameras != null)
+			//{
+			//	foreach (ModuleHighDefCamera m in stockCameras)
+			//	{
+			//		m.DisableModule();
+			//	}
+			//}
 		}
 
 		public void EnableModule()

diff --git a/SCANsat/SCAN_UI/SCANkscMap.cs b/SCANsat/SCAN_UI/SCANkscMap.cs
@@ -21,6 +21,7 @@
 using SCANsat.SCAN_Data;
 using SCANsat.SCAN_Map;
 using UnityEngine;
+using System.Linq;
 
 namespace SCANsat.SCAN_UI
 {

diff --git a/SCANsat/SCANsat.csproj b/SCANsat/SCANsat.csproj
@@ -142,10 +142,6 @@
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="KSPUtil">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\KSPUtil.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System">
       <HintPath>..\..\..\KSP_Data\Managed\System.dll</HintPath>
     </Reference>