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

Commits on Oct 1, 2021

  1. Copy the full SHA
    ab2c39f View commit details
  2. Copy the full SHA
    9a98103 View commit details
  3. Copy the full SHA
    06372fa View commit details

Commits on Oct 2, 2021

  1. The binaries.

    pleroy committed Oct 2, 2021
    Copy the full SHA
    7ec5ca2 View commit details
  2. No Any CPU.

    pleroy committed Oct 2, 2021
    Copy the full SHA
    499b5c3 View commit details
  3. Ignore stupid warnings.

    pleroy committed Oct 2, 2021
    Copy the full SHA
    338d8ca View commit details
  4. Merge pull request #3133 from pleroy/3037

    A small DLL that will tell the user that they installed the source instead of the binary
    pleroy authored Oct 2, 2021
    Copy the full SHA
    fd669b1 View commit details
11 changes: 11 additions & 0 deletions Principia.sln
Original file line number Diff line number Diff line change
@@ -156,6 +156,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat
documentation\Setup.md = documentation\Setup.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ksp_plugin_adapter_stub", "ksp_plugin_adapter_stub\ksp_plugin_adapter_stub.csproj", "{34D500D6-4197-4665-BFDC-594957137CD6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -201,6 +203,7 @@ Global
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release KSP 1.7.3|x64.ActiveCfg = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release KSP 1.7.3|x64.Build.0 = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release_LLVM|x64.ActiveCfg = Release_LLVM|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release_LLVM|x64.Build.0 = Release_LLVM|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release|x64.ActiveCfg = Release|x64
{7B174B21-0837-4BEE-864E-08AD3C74046A}.Release|x64.Build.0 = Release|x64
{41332E9A-729C-45C4-BDE1-A567608DADF2}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,6 +326,14 @@ Global
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release_LLVM|x64.Build.0 = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release|x64.ActiveCfg = Release|Any CPU
{A0E67E1B-E5A6-45A0-B42C-4330A6643CD7}.Release|x64.Build.0 = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Debug|x64.ActiveCfg = Debug|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Debug|x64.Build.0 = Debug|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release KSP 1.7.3|x64.ActiveCfg = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release KSP 1.7.3|x64.Build.0 = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release_LLVM|x64.ActiveCfg = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release_LLVM|x64.Build.0 = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release|x64.ActiveCfg = Release|Any CPU
{34D500D6-4197-4665-BFDC-594957137CD6}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
17 changes: 17 additions & 0 deletions ksp_plugin_adapter_stub/config_node_extensions_stub.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace principia {
namespace ksp_plugin_adapter {

internal static class ConfigNodeExtensions {
public static string GetAtMostOneValue(this ConfigNode node, string name) {
return string.Empty;
}
}

} // namespace ksp_plugin_adapter
} // namespace principia
39 changes: 39 additions & 0 deletions ksp_plugin_adapter_stub/ksp_plugin_adapter_stub.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using KSP.Localization;

namespace principia {
namespace ksp_plugin_adapter {

[KSPScenario(createOptions: ScenarioCreationOptions.AddToAllGames,
tgtScenes: new GameScenes[]{GameScenes.FLIGHT,
GameScenes.MAINMENU,
GameScenes.SPACECENTER,
GameScenes.TRACKSTATION})]
public partial class PrincipiaPluginAdapterStub : ScenarioModule,
SupervisedWindowRenderer.
ISupervisor {
[KSPField(isPersistant = true)]
private readonly Dialog dll_stub_executed_ = new Dialog(persist_state: false);

#pragma warning disable 67
public event Action LockClearing;
public event Action WindowsDisposal;
public event Action WindowsRendering;
#pragma warning restore 67

PrincipiaPluginAdapterStub() {
dll_stub_executed_.message =
Localizer.Format("#Principia_DLLStubExecuted");
dll_stub_executed_.Show();
}

private void OnGUI() {
dll_stub_executed_.RenderWindow();
}
}

} // namespace ksp_plugin_adapter
} // namespace principia
106 changes: 106 additions & 0 deletions ksp_plugin_adapter_stub/ksp_plugin_adapter_stub.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{34D500D6-4197-4665-BFDC-594957137CD6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>principia.ksp_plugin_adapter</RootNamespace>
<AssemblyName>principia.ksp_plugin_adapter_stub</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Debug\GameData\Principia\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\Release\GameData\Principia\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'Debug'">
<Reference Include="Assembly-CSharp">
<HintPath>..\..\KSP Assemblies\1.12.2\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.ImageConversionModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.InputLegacyModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.PhysicsModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.PhysicsModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.TextRenderingModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\KSP Assemblies\1.12.2\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="config_node_extensions_stub.cs" />
<Compile Include="ksp_plugin_adapter_stub.cs" />
<Compile Include="..\ksp_plugin_adapter\dialog.cs" />
<Compile Include="..\ksp_plugin_adapter\style.cs" />
<Compile Include="..\ksp_plugin_adapter\window_renderer.cs" />
</ItemGroup>
<ItemGroup>
<None Include="ksp_plugin_adapter_stub.dll.config" />
<None Include="localization\en-us.cfg" />
<None Include="localization\fr-fr.cfg" />
<None Include="localization\zh-cn.cfg" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="Rename" AfterTargets="AfterBuild" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Move SourceFiles="$(TargetPath)" DestinationFiles="$(ProjectDir)$(ProjectName)$(TargetExt)" />
<Message Text="Renamed $(TargetPath) to $(ProjectDir)$(ProjectName)$(TargetExt)" Importance="high" />
<Move SourceFiles="$(OutDir)$(TargetName).pdb" DestinationFiles="$(ProjectDir)$(ProjectName).pdb" />
<Message Text="Renamed $(OutDir)$(TargetName).pdb to $(ProjectDir)$(ProjectName).pdb" Importance="high" />
</Target>
</Project>
Binary file not shown.
5 changes: 5 additions & 0 deletions ksp_plugin_adapter_stub/ksp_plugin_adapter_stub.dll.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<configuration>
<dllmap dll="principia" os="windows" cpu="x86-64" target="GameData/Principia/x64/principia.dll"/>
<dllmap dll="principia" os="linux" cpu="x86-64" target="GameData/Principia/Linux64/principia.so"/>
<dllmap dll="principia" os="osx" cpu="x86-64" target="GameData/Principia/MacOS64/principia.so" />
</configuration>
Binary file not shown.
5 changes: 5 additions & 0 deletions ksp_plugin_adapter_stub/localization/en-us.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Localization {
en-us {
#Principia_DLLStubExecuted = You are trying to execute the source code of Principia instead the binary.\nPlease download the binary from the short links in https:\u002F\u002Fgithub.com/mockingbirdnest/Principia#readme.
}
}
5 changes: 5 additions & 0 deletions ksp_plugin_adapter_stub/localization/fr-fr.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Localization {
fr-fr {
#Principia_DLLStubExecuted = Vous êtes en train d'essayer d'exécuter le code source de Principia au lieu du binaire.\nVeuillez télécharger le binaire depuis les liens courts se trouvant dans https:\u002F\u002Fgithub.com/mockingbirdnest/Principia#readme.
}
}
5 changes: 5 additions & 0 deletions ksp_plugin_adapter_stub/localization/zh-cn.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Localization {
zh-cn {
#Principia_DLLStubExecuted = You are trying to execute the source code of Principia instead the binary.\nPlease download the binary from the short links in https:\u002F\u002Fgithub.com/mockingbirdnest/Principia#readme.
}
}