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: 9666ecb13862
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 208a2ec9d140
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 5, 2021

  1. Support for 1.12.2.

    pleroy committed Aug 5, 2021
    Copy the full SHA
    1c37b49 View commit details
  2. Merge pull request #3082 from pleroy/1.12.2

    Support for 1.12.2
    pleroy authored Aug 5, 2021
    Copy the full SHA
    208a2ec View commit details
Showing with 16 additions and 15 deletions.
  1. +1 −1 ksp_plugin_adapter/gl_lines.cs
  2. +4 −3 ksp_plugin_adapter/ksp_plugin_adapter.cs
  3. +11 −11 ksp_plugin_adapter/ksp_plugin_adapter.csproj
2 changes: 1 addition & 1 deletion ksp_plugin_adapter/gl_lines.cs
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ private static UnityEngine.Material line_material {
get {
if (line_material_ == null) {
line_material_ = new UnityEngine.Material(
#if KSP_VERSION_1_11_2
#if KSP_VERSION_1_12_2
UnityEngine.Shader.Find("KSP/Particles/Additive"));
#elif KSP_VERSION_1_7_3
UnityEngine.Shader.Find("Particles/Additive"));
7 changes: 4 additions & 3 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
Original file line number Diff line number Diff line change
@@ -287,14 +287,15 @@ private readonly Dictionary<uint, PartCentredForceHolder[]>
load_error);
bad_installation_dialog_.Show();
}
#if KSP_VERSION_1_11_2
#if KSP_VERSION_1_12_2
if (!(Versioning.version_major == 1 &&
(Versioning.version_minor == 8 && Versioning.Revision == 1) ||
(Versioning.version_minor == 9 && Versioning.Revision == 1) ||
(Versioning.version_minor == 10 && Versioning.Revision == 1) ||
(Versioning.version_minor == 11 && Versioning.Revision <= 2))) {
(Versioning.version_minor == 11 && Versioning.Revision <= 2) ||
(Versioning.version_minor == 12 && Versioning.Revision == 2))) {
string expected_version =
"1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.11.1, and 1.11.2";
"1.8.1, 1.9.1, 1.10.1, 1.11.x, and 1.12.2";
#elif KSP_VERSION_1_7_3
if (!(Versioning.version_major == 1 &&
(Versioning.version_minor == 5 && Versioning.Revision == 1) ||
22 changes: 11 additions & 11 deletions ksp_plugin_adapter/ksp_plugin_adapter.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Debug\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_11_2</DefineConstants>
<DefineConstants>TRACE;DEBUG;KSP_VERSION_1_12_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Release\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;KSP_VERSION_1_11_2</DefineConstants>
<DefineConstants>TRACE;KSP_VERSION_1_12_2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
@@ -65,40 +65,40 @@
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Debug'">
<Reference Include="Assembly-CSharp">
<HintPath>..\..\KSP Assemblies\1.11.0\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.ImageConversionModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.ImageConversionModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.InputLegacyModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.InputLegacyModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.PhysicsModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\KSP Assemblies\1.11.0\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>