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: 02ab4779bed2
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a23a658c203
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2017

  1. A couple of crashes, there are more

    @eggrobin
    eggrobin committed Mar 14, 2017
    Copy the full SHA
    c9fa6bf View commit details

  2. Merge pull request #1259 from eggrobin/profile-kraken 

    A couple of crashes, there are more
    @eggrobin
    eggrobin authored Mar 14, 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
    9a23a65 View commit details
Showing with 6 additions and 3 deletions.
  1. +6 −3 ksp_plugin_adapter/ksp_plugin_adapter.cs
9 changes: 6 additions & 3 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
View file
Original file line number Diff line number Diff line change
@@ -800,7 +800,8 @@ private void AdvanceTimeAndNudgeVesselsAfterPhysicsSimulation() {
// We don't want to do too many things here, since all the KSP classes
// still think they're in the preceding step. We only nudge the Unity
// transforms of loaded vessels & their parts.
if (has_active_vessel_in_space() && !FlightGlobals.ActiveVessel.packed) {
if (has_active_vessel_in_space() && !FlightGlobals.ActiveVessel.packed &&
plugin_.HasVessel(FlightGlobals.ActiveVessel.id.ToString())) {
// TODO(egg): move this to the C++, this is just to check that I
// understand the issue.
foreach (Vessel vessel in FlightGlobals.VesselsLoaded) {
@@ -1632,8 +1633,10 @@ private void ResetPlugin() {
}
}
}
plugin_.AdvanceTime(Planetarium.GetUniversalTime(),
Planetarium.InverseRotAngle);
if (Planetarium.GetUniversalTime() > plugin_.CurrentTime()) {
plugin_.AdvanceTime(Planetarium.GetUniversalTime(),
Planetarium.InverseRotAngle);
}
plotting_frame_selector_.reset(
new ReferenceFrameSelector(this,
plugin_,