Skip to content

Commit

Permalink
Merge 2.9.3.0 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@TriggerAu
TriggerAu committed Mar 17, 2018
2 parents eb749d6 + c81219e commit c7a0e93
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 49 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*.user
*.sln.docstates

.vs/

# Build results

[Dd]ebug/
Expand Down
78 changes: 39 additions & 39 deletions AlternateResourcePanel/ARP.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions AlternateResourcePanel/KSPAlternateResourcePanel.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Squad\KSP\KSP\Library\ScriptAssemblies\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\_Versions\KSP_win_PluginTest\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Squad\KSP\KSP\Library\UnityAssemblies\UnityEngine.dll</HintPath>
<HintPath>..\..\_Versions\KSP_win_PluginTest\KSP_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions AlternateResourcePanel/KSPAlternateResourcePanel.version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
4 changes: 2 additions & 2 deletions AlternateResourcePanel/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
3 changes: 3 additions & 0 deletions PlugInFiles/ReadMe-KSPAlternateResourcePanel.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c7a0e93

Please sign in to comment.