Merge pull request #204 from DMagic1/dev

SCANsat version 15.0

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":4,
-         "BUILD":9
+         "PATCH":5,
+         "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
 }

SCANsat/CHANGELOG.txt

@@ -1,3 +1,14 @@
+Version 15.0 - 2016-3-30
+------------------------
+
+- Update to KSP 1.1 and Unity 5
+
+- Known issues
+   - Ground tracks don't function
+   - MechJeb integration removed
+   - SCANsat resource scanning requires Module Manager; it won't work without it and hasn't been tested in KSP 1.1
+
+
 Version 14.9 - 2016-3-6
 ------------------------
 

SCANsat/Properties/AssemblyInfo.cs

@@ -14,10 +14,10 @@
 // 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.4.0.9")]
-[assembly: AssemblyFileVersion ("1.4.0.9")]
-[assembly: AssemblyInformationalVersion ("v14.9")]
+[assembly: AssemblyVersion ("1.5.0.0")]
+[assembly: AssemblyFileVersion ("1.5.0.0")]
+[assembly: AssemblyInformationalVersion ("v15.0")]
 
-[assembly: KSPAssembly ("SCANsat", 1, 4)]
+[assembly: KSPAssembly ("SCANsat", 1, 5)]
 
 

SCANsat/SCAN_Data/SCANdata.cs

@@ -320,7 +320,7 @@ public List<SCANwaypoint> Waypoints
 
 					if (WaypointManager.Instance() != null)
 					{
-						var remaining = WaypointManager.Instance().AllWaypoints();
+						var remaining = WaypointManager.Instance().Waypoints;
 						for (int i = 0; i < remaining.Count; i++)
 						{
 							Waypoint p = remaining[i];

SCANsat/SCAN_PartModules/SCANsat.cs

@@ -16,6 +16,7 @@
 using SCANsat.SCAN_Data;
 using SCANsat.SCAN_Toolbar;
 using SCANsat.SCAN_UI;
+using KSP.UI.Screens.Flight.Dialogs;
 
 using UnityEngine;
 using palette = SCANsat.SCAN_UI.UI_Framework.SCANpalette;
@@ -581,7 +582,7 @@ public void ReviewData()
 			if (expDialog != null)
 				DestroyImmediate(expDialog);
 			ScienceData sd = storedData[0];
-			expDialog = ExperimentsResultDialog.DisplayResult(new ExperimentResultDialogPage(part, sd, 1f, 0f, false, "", true, false, DumpData, KeepData, TransmitData, null));
+			expDialog = ExperimentsResultDialog.DisplayResult(new ExperimentResultDialogPage(part, sd, 1f, 0f, false, "", true, new ScienceLabSearch(vessel, sd), DumpData, KeepData, TransmitData, null));
 		}
 
 		public bool IsRerunnable()

SCANsat/SCAN_Platform/SCAN_MBW.cs

@@ -123,6 +123,50 @@ protected SCAN_MBW()
 		}
 		#endregion
 
+		protected override void Start()
+		{
+			base.Start();
+
+			GameEvents.onShowUI.Add(UIOn);
+			GameEvents.onHideUI.Add(UIOff);
+			GameEvents.onGUIMissionControlSpawn.Add(UIOff);
+			GameEvents.onGUIMissionControlDespawn.Add(UIOff);
+			GameEvents.onGUIRnDComplexSpawn.Add(UIOff);
+			GameEvents.onGUIRnDComplexDespawn.Add(UIOn);
+			GameEvents.onGUIAdministrationFacilitySpawn.Add(UIOff);
+			GameEvents.onGUIAdministrationFacilityDespawn.Add(UIOn);
+			GameEvents.onGUIAstronautComplexSpawn.Add(UIOff);
+			GameEvents.onGUIAstronautComplexDespawn.Add(UIOn);
+		}
+
+		protected override void OnDestroy()
+		{
+			base.OnDestroy();
+
+			GameEvents.onShowUI.Remove(UIOn);
+			GameEvents.onHideUI.Remove(UIOff);
+			GameEvents.onGUIMissionControlSpawn.Remove(UIOff);
+			GameEvents.onGUIMissionControlDespawn.Remove(UIOff);
+			GameEvents.onGUIRnDComplexSpawn.Remove(UIOff);
+			GameEvents.onGUIRnDComplexDespawn.Remove(UIOn);
+			GameEvents.onGUIAdministrationFacilitySpawn.Remove(UIOff);
+			GameEvents.onGUIAdministrationFacilityDespawn.Remove(UIOn);
+			GameEvents.onGUIAstronautComplexSpawn.Remove(UIOff);
+			GameEvents.onGUIAstronautComplexDespawn.Remove(UIOn);
+		}
+
+		private void UIOn()
+		{
+			showUI = true;
+		}
+
+		private void UIOff()
+		{
+			showUI = false;
+		}
+
+		private bool showUI = true;
+
 		internal Int32 WindowID { get; private set; }
 		internal TimeSpan DrawWindowInternalDuration { get; private set; }
 		private bool _Visible;
@@ -227,20 +271,30 @@ public bool Visible
 			get { return _Visible; }
 			set
 			{
-				if (_Visible != value)
-				{
-					if (value)
-					{
-						Log.Debug("Adding Window to PostDrawQueue-{0}", WindowID); RenderingManager.AddToPostDrawQueue(5, this.DrawGUI);
-					}
-					else
-					{
-						Log.Debug("Removing Window from PostDrawQueue", WindowID); RenderingManager.RemoveFromPostDrawQueue(5, this.DrawGUI);
-					}
-				}
+				//if (_Visible != value)
+				//{
+				//	if (value)
+				//	{
+				//		Log.Debug("Adding Window to PostDrawQueue-{0}", WindowID); RenderingManager.AddToPostDrawQueue(5, this.DrawGUI);
+				//	}
+				//	else
+				//	{
+				//		Log.Debug("Removing Window from PostDrawQueue", WindowID); RenderingManager.RemoveFromPostDrawQueue(5, this.DrawGUI);
+				//	}
+				//}
 				_Visible = value;
 			}
 		}
+		private void OnGUI()
+		{
+			if (!showUI)
+				return;
+
+			if (!_Visible)
+				return;
+
+			this.DrawGUI();
+		}
 		protected void DrawGUI()
 		{
 			string cc = "";

SCANsat/SCAN_Toolbar/SCANappLauncher.cs

@@ -15,6 +15,7 @@
 using SCANsat.SCAN_Platform;
 using SCANsat.SCAN_UI;
 using SCANsat.SCAN_UI.UI_Framework;
+using KSP.UI.Screens;
 
 namespace SCANsat.SCAN_Toolbar
 {

SCANsat/SCAN_UI/SCANbigMap.cs

@@ -69,6 +69,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			//Initialize the map object
 			Visible = SCANcontroller.controller.bigMapVisible;
 			WindowRect.x = SCANcontroller.controller.map_x;
@@ -115,6 +117,8 @@ private void initializeMap()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			SCANcontroller.controller.unloadPQS(bigmap.Body, mapSource.BigMap);
 		}
 

SCANsat/SCAN_UI/SCANcolorSelection.cs

@@ -112,6 +112,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			TooltipsEnabled = false;
 
 			if (SCANconfigLoader.languagePack != null)
@@ -219,6 +221,8 @@ private void loadStrings()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			removeControlLocks();
 			TooltipsEnabled = false;
 		}

SCANsat/SCAN_UI/SCANinstrumentUI.cs

@@ -66,6 +66,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			GameEvents.onVesselSOIChanged.Add(soiChange);
 			GameEvents.onVesselChange.Add(vesselChange);
 			GameEvents.onVesselWasModified.Add(vesselChange);
@@ -84,6 +86,8 @@ protected override void Start()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			GameEvents.onVesselSOIChanged.Remove(soiChange);
 			GameEvents.onVesselChange.Remove(vesselChange);
 			GameEvents.onVesselWasModified.Remove(vesselChange);

SCANsat/SCAN_UI/SCANkscMap.cs

@@ -66,6 +66,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			Visible = SCANcontroller.controller.kscMapVisible;
 			if (b == null)
 				b = Planetarium.fetch.Home;
@@ -95,6 +97,8 @@ protected override void Start()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			removeControlLocks();
 			if (spotMap != null)
 				Destroy(spotMap);
@@ -112,7 +116,7 @@ protected override void Update()
 
 			MapObject target = PlanetariumCamera.fetch.target;
 
-			if (target.type != MapObject.MapObjectType.VESSEL)
+			if (target.type != MapObject.ObjectType.Vessel)
 			{
 				v = null;
 				return;

SCANsat/SCAN_UI/SCANmainMap.cs

@@ -59,6 +59,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			Visible = SCANcontroller.controller.mainMapVisible;
 			v = FlightGlobals.ActiveVessel;
 			data = SCANUtil.getData(v.mainBody);

SCANsat/SCAN_UI/SCANoverlayController.cs

@@ -72,6 +72,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			GameEvents.onShowUI.Add(showUI);
 			GameEvents.onHideUI.Add(hideUI);
 			GameEvents.onGameSceneSwitchRequested.Add(switchScene);
@@ -107,6 +109,8 @@ private void switchScene(GameEvents.FromToAction<GameScenes, GameScenes> FT)
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			GameEvents.onShowUI.Remove(showUI);
 			GameEvents.onHideUI.Remove(hideUI);
 			GameEvents.onGameSceneSwitchRequested.Remove(switchScene);

SCANsat/SCAN_UI/SCANresourceSettings.cs

@@ -65,6 +65,8 @@ protected override void Awake()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			oldNarrowBand = SCANcontroller.controller.needsNarrowBand;
 			oldStockScanThreshold = SCANcontroller.controller.useScanThreshold;
 			oldInstantScan = SCANcontroller.controller.easyModeScanning;

SCANsat/SCAN_UI/SCANsettingsUI.cs

@@ -77,6 +77,8 @@ protected override void Awake()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			removeControlLocks();
 			TooltipsEnabled = false;
 		}
@@ -89,6 +91,8 @@ internal void removeControlLocks()
 
 		protected override void Start()
 		{
+			base.Start();
+
 			oldTooltips = SCANcontroller.controller.toolTips;
 			TooltipsEnabled = false;
 			stockToolbar = SCANcontroller.controller.useStockAppLauncher;

SCANsat/SCAN_UI/SCANzoomWindow.cs

@@ -131,6 +131,8 @@ protected virtual void Startup()
 
 		protected override void OnDestroy()
 		{
+			base.OnDestroy();
+
 			removeControlLocks();
 
 			SCANcontroller.controller.unloadPQS(spotmap.Body, mapSource.ZoomMap);
@@ -383,7 +385,7 @@ protected override void Update()
 				{
 					MapObject target = PlanetariumCamera.fetch.target;
 
-					if (target.type == MapObject.MapObjectType.VESSEL)
+					if (target.type == MapObject.ObjectType.Vessel)
 						v = target.vessel;
 					else
 						v = null;

SCANsat/SCAN_UI/UI_Framework/SCANskins.cs

@@ -181,8 +181,8 @@ private static void initializeSkins()
 			SCAN_skin = SCAN_SkinsLibrary.CopySkin("Unity");
 			SCAN_SkinsLibrary.AddSkin("SCAN_Unity", SCAN_skin);
 
-			ScreenMessages SM = (ScreenMessages)GameObject.FindObjectOfType(typeof(ScreenMessages));
-			dotty = SM.textStyles[1].font;
+			//ScreenMessages SM = (ScreenMessages)GameObject.FindObjectOfType(typeof(ScreenMessages));
+			//dotty = SM.textStyles[1].font;
 
 			SCAN_window = new GUIStyle(SCAN_SkinsLibrary.DefUnitySkin.window);
 			SCAN_window.name = "SCAN_Window";
@@ -304,7 +304,7 @@ private static void initializeSkins()
 			SCAN_anomalyOverlay = new GUIStyle(SCAN_SkinsLibrary.DefUnitySkin.label);
 			SCAN_anomalyOverlay.name = "SCAN_AnomalyOverlay";
 			SCAN_anomalyOverlay.font = dotty;
-			SCAN_anomalyOverlay.fontSize = 32;
+			SCAN_anomalyOverlay.fontSize = 20;
 			SCAN_anomalyOverlay.fontStyle = FontStyle.Bold;
 			SCAN_anomalyOverlay.normal.textColor = palette.cb_skyBlue;
 
@@ -335,7 +335,7 @@ private static void initializeSkins()
 			SCAN_headline.name = "SCAN_Headline";
 			SCAN_headline.normal.textColor = palette.xkcd_YellowGreen;
 			SCAN_headline.alignment = TextAnchor.MiddleCenter;
-			SCAN_headline.fontSize = 30;
+			SCAN_headline.fontSize = 20;
 			SCAN_headline.font = dotty;
 
 			SCAN_headerButton = new GUIStyle(SCAN_SkinsLibrary.DefUnitySkin.button);
@@ -348,7 +348,7 @@ private static void initializeSkins()
 
 			SCAN_headlineSmall = new GUIStyle(SCAN_headline);
 			SCAN_headlineSmall.name = "SCAN_HeadlineSmall";
-			SCAN_headlineSmall.fontSize = 30;
+			SCAN_headlineSmall.fontSize = 16;
 
 			SCAN_labelSmallLeft = new GUIStyle(SCAN_whiteReadoutLabel);
 			SCAN_labelSmallLeft.name = "SCAN_LabelSmallLeft";
@@ -369,7 +369,7 @@ private static void initializeSkins()
 			SCAN_toggle.name = "SCAN_Toggle";
 			SCAN_toggle.font = dotty;
 			SCAN_toggle.onNormal.textColor = palette.xkcd_YellowGreen;
-			SCAN_toggle.fontSize = 30;
+			SCAN_toggle.fontSize = 20;
 			SCAN_toggle.fixedHeight = 28;
 			SCAN_toggle.fixedWidth = 28;