From c81219e990db820298d791f84fcb2008ecae0f96 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Sat, 17 Mar 2018 17:51:10 +1100 Subject: [PATCH] Version 2.9.3.0 ready --- .gitignore | 2 + AlternateResourcePanel/ARP.cs | 78 +++++++++---------- .../KSPAlternateResourcePanel.csproj | 6 +- .../KSPAlternateResourcePanel.version | 10 +-- .../Properties/AssemblyInfo.cs | 4 +- .../ReadMe-KSPAlternateResourcePanel.txt | 3 + 6 files changed, 54 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 1bc915c..90d40eb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ *.user *.sln.docstates +.vs/ + # Build results [Dd]ebug/ diff --git a/AlternateResourcePanel/ARP.cs b/AlternateResourcePanel/ARP.cs index 7dfbbd4..12f0290 100644 --- a/AlternateResourcePanel/ARP.cs +++ b/AlternateResourcePanel/ARP.cs @@ -1198,45 +1198,45 @@ internal void DestroyToolbarButton(IButton btnToDestroy) #if DEBUG - //This will kick us into the save called default and set the first vessel active - [KSPAddon(KSPAddon.Startup.MainMenu, false)] - public class Debug_AutoLoadPersistentSaveOnStartup : MonoBehaviour - { - //use this variable for first run to avoid the issue with when this is true and multiple addons use it - public static bool first = true; - public void Start() - { - //only do it on the first entry to the menu - if (first) - { - first = false; - HighLogic.SaveFolder = "default"; - Game game = GamePersistence.LoadGame("persistent", HighLogic.SaveFolder, true, false); + ////This will kick us into the save called default and set the first vessel active + //[KSPAddon(KSPAddon.Startup.MainMenu, false)] + //public class Debug_AutoLoadPersistentSaveOnStartup : MonoBehaviour + //{ + // //use this variable for first run to avoid the issue with when this is true and multiple addons use it + // public static bool first = true; + // public void Start() + // { + // //only do it on the first entry to the menu + // if (first) + // { + // first = false; + // HighLogic.SaveFolder = "default"; + // Game game = GamePersistence.LoadGame("persistent", HighLogic.SaveFolder, true, false); - if (game != null && game.flightState != null && game.compatible) - { - HighLogic.CurrentGame = game; - - Int32 FirstVessel; - Boolean blnFoundVessel=false; - for (FirstVessel = 0; FirstVessel < game.flightState.protoVessels.Count; FirstVessel++) - { - if (game.flightState.protoVessels[FirstVessel].vesselType != VesselType.SpaceObject && - game.flightState.protoVessels[FirstVessel].vesselType != VesselType.Unknown) - { - blnFoundVessel = true; - break; - } - } - if (!blnFoundVessel) - HighLogic.LoadScene(GameScenes.SPACECENTER); - else - FlightDriver.StartAndFocusVessel(game, FirstVessel); - } - - //CheatOptions.InfiniteFuel = true; - } - } - } + // if (game != null && game.flightState != null && game.compatible) + // { + // HighLogic.CurrentGame = game; + + // Int32 FirstVessel; + // Boolean blnFoundVessel=false; + // for (FirstVessel = 0; FirstVessel < game.flightState.protoVessels.Count; FirstVessel++) + // { + // if (game.flightState.protoVessels[FirstVessel].vesselType != VesselType.SpaceObject && + // game.flightState.protoVessels[FirstVessel].vesselType != VesselType.Unknown) + // { + // blnFoundVessel = true; + // break; + // } + // } + // if (!blnFoundVessel) + // HighLogic.LoadScene(GameScenes.SPACECENTER); + // else + // FlightDriver.StartAndFocusVessel(game, FirstVessel); + // } + + // //CheatOptions.InfiniteFuel = true; + // } + // } + //} #endif } \ No newline at end of file diff --git a/AlternateResourcePanel/KSPAlternateResourcePanel.csproj b/AlternateResourcePanel/KSPAlternateResourcePanel.csproj index 9d31a50..0f7ad98 100644 --- a/AlternateResourcePanel/KSPAlternateResourcePanel.csproj +++ b/AlternateResourcePanel/KSPAlternateResourcePanel.csproj @@ -40,16 +40,16 @@ OnBuildSuccess - + False - C:\Squad\KSP\KSP\Library\ScriptAssemblies\Assembly-CSharp.dll + ..\..\_Versions\KSP_win_PluginTest\KSP_Data\Managed\Assembly-CSharp.dll False - C:\Squad\KSP\KSP\Library\UnityAssemblies\UnityEngine.dll + ..\..\_Versions\KSP_win_PluginTest\KSP_Data\Managed\UnityEngine.dll diff --git a/AlternateResourcePanel/KSPAlternateResourcePanel.version b/AlternateResourcePanel/KSPAlternateResourcePanel.version index aad4e91..b9dd534 100644 --- a/AlternateResourcePanel/KSPAlternateResourcePanel.version +++ b/AlternateResourcePanel/KSPAlternateResourcePanel.version @@ -5,22 +5,22 @@ "VERSION": { "MAJOR": 2, "MINOR": 9, - "PATCH": 2, + "PATCH": 3, "BUILD": 0 }, "KSP_VERSION": { "MAJOR": 1, - "MINOR": 3, - "PATCH": 0 + "MINOR": 4, + "PATCH": 1 }, "KSP_VERSION_MIN": { "MAJOR": 1, - "MINOR": 3, + "MINOR": 4, "PATCH": 0 }, "KSP_VERSION_MAX": { "MAJOR": 1, - "MINOR": 3, + "MINOR": 4, "PATCH": 99 } } diff --git a/AlternateResourcePanel/Properties/AssemblyInfo.cs b/AlternateResourcePanel/Properties/AssemblyInfo.cs index 947b40d..edf6e03 100644 --- a/AlternateResourcePanel/Properties/AssemblyInfo.cs +++ b/AlternateResourcePanel/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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("2.9.2.0")] -[assembly: AssemblyFileVersion("2.9.2.0")] +[assembly: AssemblyVersion("2.9.3.0")] +[assembly: AssemblyFileVersion("2.9.3.0")] diff --git a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt index 8e75d45..05620c0 100644 --- a/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt +++ b/PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt @@ -28,6 +28,9 @@ LICENSE This work is licensed under an MIT license as outlined at the OSI site. Visit the documentation site for more details and Attribution VERSION HISTORY +Version 2.9.3.0 - KSP Version: 1.4.1 +- Recompile for 1.4.1 + Version 2.9.2.0 - KSP Version: 1.3.0 - Recompile for 1.3 - Fix issue with Separator as first item (Issue #88)