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: 8ed368b9c144
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e1a26b56b7e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 12, 2017

  1. next version information and journal for 陈景润

    @eggrobin
    eggrobin committed Nov 12, 2017
    Copy the full SHA
    b803c0e View commit details

Commits on Nov 13, 2017

  1. Merge pull request #1625 from eggrobin/journal-for-陈景润 

    Journal for 陈景润
    @pleroy
    pleroy authored Nov 13, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7e1a26b View commit details
Showing with 13 additions and 4 deletions.
  1. +1 −1 journal/player_test.cpp
  2. +12 −3 ksp_plugin_adapter/ksp_plugin_adapter.cs
2 changes: 1 addition & 1 deletion journal/player_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ namespace journal {
void BM_PlayForReal(benchmark::State& state) {
while (state.KeepRunning()) {
Player player(
R"(P:\Public Mockingbird\Principia\Journals\JOURNAL.20171013-233034)");
R"(P:\Public Mockingbird\Principia\Journals\JOURNAL.20171112-193041)");
int count = 0;
while (player.Play()) {
++count;
15 changes: 12 additions & 3 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
View file
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_ = 221;
private const String next_release_name_ = "Christoffel";
private const int next_release_lunation_number_ = 222;
private DateTimeOffset next_release_date_ =
new DateTimeOffset(2017, 11, 18, 11, 42, 00, TimeSpan.Zero);
new DateTimeOffset(2017, 12, 18, 06, 31, 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
@@ -2020,11 +2020,20 @@ private void DrawMainWindow(int window_id) {
UnityEngine.GUILayout.TextArea(text : "Plugin is not started");
}
if (DateTimeOffset.Now > next_release_date_) {
#if KSP_VERSION_1_3_0
UnityEngine.GUILayout.TextArea(
"Announcement: the new moon of lunation number " +
next_release_lunation_number_ +
" has come; please update KSP to version 1.3.1, " +
"and download the latest Principia release, " +
next_release_name_ + ".");
#else
UnityEngine.GUILayout.TextArea(
"Announcement: the new moon of lunation number " +
next_release_lunation_number_ +
" has come; please download the latest Principia release, " +
next_release_name_ + ".");
#endif
}
String version;
String unused_build_date;