Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc36d83bf6d8
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e29425a9f7c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 27, 2019

  1. Next release is Euler.

    pleroy committed Jan 27, 2019
    Copy the full SHA
    2c19ed9 View commit details
  2. Support 1.6.1.

    pleroy committed Jan 27, 2019
    Copy the full SHA
    de60582 View commit details
  3. Merge pull request #2069 from pleroy/Euler

    Next release is Euler and it does 1.6.1
    pleroy authored Jan 27, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9e29425 View commit details
Showing with 19 additions and 17 deletions.
  1. +9 −7 ksp_plugin_adapter/ksp_plugin_adapter.cs
  2. +10 −10 ksp_plugin_adapter/ksp_plugin_adapter.csproj
16 changes: 9 additions & 7 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ public partial class PrincipiaPluginAdapter
: ScenarioModule,
WindowRenderer.ManagerInterface {

private const String next_release_name_ = "Εὐκλείδης";
private const int next_release_lunation_number_ = 236;
private const String next_release_name_ = "Euler";
private const int next_release_lunation_number_ = 237;
private DateTimeOffset next_release_date_ =
new DateTimeOffset(2019, 02, 04, 21, 04, 00, TimeSpan.Zero);
new DateTimeOffset(2019, 03, 06, 16, 04, 00, TimeSpan.Zero);

// From https://forum.kerbalspaceprogram.com/index.php?/topic/84273--/,
// edited 2017-03-09. Where the name of the layer is not CamelCase, the
@@ -249,12 +249,14 @@ private KSP.UI.Screens.SpaceTracking space_tracking {
Versioning.version_minor != 3 ||
Versioning.Revision != 1) {
string expected_version = "1.3.1";
#elif KSP_VERSION_1_5_1
#elif KSP_VERSION_1_6_1
if (!(Versioning.version_major == 1 &&
(Versioning.version_minor == 4 &&
(Versioning.Revision >= 1 && Versioning.Revision <= 5)) ||
Versioning.version_minor == 5 && Versioning.Revision == 1)) {
string expected_version = "1.5.1, 1.4.5, 1.4.4, 1.4.3, 1.4.2, and 1.4.1";
(Versioning.version_minor == 5 && Versioning.Revision == 1) ||
(Versioning.version_minor == 6 && Versioning.Revision == 1))) {
string expected_version =
"1.6.1, 1.5.1, 1.4.5, 1.4.4, 1.4.3, 1.4.2, and 1.4.1";
#endif
Log.Fatal("Unexpected KSP version " + Versioning.version_major + "." +
Versioning.version_minor + "." + Versioning.Revision +
@@ -491,7 +493,7 @@ private bool LoadTextureIfExists(out UnityEngine.Texture texture,
path;
if (File.Exists(full_path)) {
var texture2d = new UnityEngine.Texture2D(2, 2);
#if KSP_VERSION_1_5_1
#if KSP_VERSION_1_6_1
bool success = UnityEngine.ImageConversion.LoadImage(
texture2d, File.ReadAllBytes(full_path));
#elif KSP_VERSION_1_3_1
20 changes: 10 additions & 10 deletions ksp_plugin_adapter/ksp_plugin_adapter.csproj
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Debug\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_5_1</DefineConstants>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_6_1</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -27,7 +27,7 @@
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Release\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;KSP_VERSION_1_5_1</DefineConstants>
<DefineConstants>TRACE;KSP_VERSION_1_6_1</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
@@ -46,36 +46,36 @@
</PropertyGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Debug'">
<Reference Include="Assembly-CSharp">
<HintPath>..\..\KSP Assemblies\1.5.1\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.ImageConversionModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.ImageConversionModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule" Condition="'$(OS)' == 'Unix'">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\KSP Assemblies\1.5.1\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.6.1\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>