Fix merge conflicts #48
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Somehow git forgot that I did commit these, wtf, anyway fixing that
…d electronics assemblies
Bugfix in RTCC longitude search routines and remove Entry PAD check splashdown latitude is exactly zero
Add Apollo 5 checklist
…om the Vector Panel Summary
Update landmark threshold times for landmark 005 calculation
…ctor for maneuver calculations
Remove pad generation for Apollo 9 uplink only SV cases
…ing as of yet, and fixed misplaced bracket preventing experiment deploy
LM S-BD Steerable Updates
… in the PrintUllage function
Fix two MPT bugs with executed maneuvers; also fix a RTCC MFD bug
RTCC: Use Vector Panel Summary vectors for maneuver calculations
Increase SPS HX value
Apollo 12 ALSEP
Close Apollo 9 DECA cb before phasing scenario
… SPS propellant displays to their values at sep
Disable SPS gauging power at CM/SM separation
# Conflicts: # Orbitersdk/samples/ProjectApollo/ProjectApollo2017.sln # Orbitersdk/samples/ProjectApollo/src_launch/IUUmbilical.cpp # Orbitersdk/samples/ProjectApollo/src_launch/IUUmbilical.h # Orbitersdk/samples/ProjectApollo/src_launch/SCMUmbilical.cpp # Orbitersdk/samples/ProjectApollo/src_launch/SCMUmbilical.h # Orbitersdk/samples/ProjectApollo/src_launch/TSMUmbilical.cpp # Orbitersdk/samples/ProjectApollo/src_launch/TSMUmbilical.h # Orbitersdk/samples/ProjectApollo/src_launch/TailUmbilical.cpp # Orbitersdk/samples/ProjectApollo/src_launch/TailUmbilical.h # Orbitersdk/samples/ProjectApollo/src_saturn/iu.cpp # Orbitersdk/samples/ProjectApollo/src_saturn/iu.h # Orbitersdk/samples/ProjectApollo/src_saturn/s1bsystems.cpp # Orbitersdk/samples/ProjectApollo/src_saturn/s1bsystems.h # Orbitersdk/samples/ProjectApollo/src_saturn/s1csystems.cpp # Orbitersdk/samples/ProjectApollo/src_saturn/s1csystems.h
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.