Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Deceleration Readouts #95

Closed
wants to merge 13 commits into from
Closed

Conversation

harryyoung
Copy link
Contributor

@harryyoung harryyoung commented Apr 30, 2016

Added Deceleration Readouts to Vessel Section. The Basic Idea is like the Suicide Burn, but with the Added bonus of Horizontal Velocity, the ability to do it from Orbit and a lot of additional Readouts like Lat/Lon, Altitude at landing Site, Slope, biome etc.

Closes #93 and #39

Will Read out time and DeltaV to kill surface velocity
UNTESTED: I cannot Compile this Thing, get various errors thrown my way
Redid Lat/Lon Calculation, the old one was getting me nowhere
Problem is: while the Longditude is calculated correctly using these information the Latitude is off. Shouldn't be. will ask for help now.
I now Correctly Calculates Lat, Lon and from That Altitude and Slope. Also the Readouts will turn off when landed/splashed.
# Conflicts:
#	Assets/Plugins/KerbalEngineer.Unity.dll
#	Output/KerbalEngineer/KerbalEngineer.dll
@harryyoung
Copy link
Contributor Author

Video Demonstartion https://www.youtube.com/watch?v=Q0ZK6VkDYRE

@harryyoung harryyoung mentioned this pull request May 5, 2016
# Conflicts:
#	Assets/Plugins/KerbalEngineer.Unity.dll
#	Output/KerbalEngineer/KerbalEngineer.dll
@harryyoung
Copy link
Contributor Author

Updated for 1.2

# Conflicts:
#	Assets/Plugins/KerbalEngineer.Unity.dll
#	Output/KerbalEngineer/KerbalEngineer.dll
@harryyoung
Copy link
Contributor Author

Updated for current version and ready to pull

@fat-lobyte
Copy link

Hi, I watched your videos and they look very promising.

I don't know how CYBUTEK runs his Repo, but I believe in the interest of avoiding merge conflicts where there are shouldn't, you should probably not change any files but the source files in question.
Could you maybe edit your branch so that only source code is modified, but no binary or project files?
Are you familiar with Git, especially with git rebase -i?
If not, I can assist you with creating an easily-mergable branch.

Hopefully that will increase the chances of CYBUTEK merging, because I love the new readouts!

@harryyoung
Copy link
Contributor Author

harryyoung commented Jan 21, 2017

@fat-lobyte thanks for the offer. I do know how to use console commands in general, however I have never felt the need to use console-git, asI prefer the compforts of GUI for simple tasks. Same goes for git/repo specific files and settings. any help would be appreciated

@fat-lobyte
Copy link

@harryyoung

No worries :)
Usually, GitHub for Windows is enough for simple tasks, but there are a few pitfalls and tricks that can only be solved with the command line.

Here's a good source if you want to learn more about git (it's german because I believe you are a german speaker? ;) ):

https://git-scm.com/book/de/v1

I will try to prepare your branch so that it will be easier to merge, and I will notify you when I am done.

@harryyoung
Copy link
Contributor Author

@fat-lobyte Danke!

@fat-lobyte
Copy link

Alright, I'm done with the branch editing. You can do the following to get the edited branch:
In the git shell, enter the following commands

# Add fat-lobyte's repository to remotes
git remote add fat-lobyte https://github.com/fat-lobyte/KerbalEngineer

# retrieve newest commits from fat-lobyte's repository
git fetch fat-lobyte

# Create a branch on your local repository called "deceleration", based on the branch "deceleration-nobin" from fat-lobyte's repository
git checkout -b deceleration fat-lobyte/deceleration-nobin

# publish deceleration branch to your own GitHub repo
git push origin deceleration

Further, I would suggest closing this pull request and creating a new one, and selecting the new "deleceration" branch as the head fork.

I have some questions and suggestions for your code, but I will ask them on the new pull request :)

@harryyoung
Copy link
Contributor Author

closed in favor of #119

@harryyoung harryyoung closed this Jan 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants