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

Commits on Aug 6, 2021

  1. A new UI

    eggrobin committed Aug 6, 2021
    Copy the full SHA
    16c31c4 View commit details
  2. spacing tweaks, words

    eggrobin committed Aug 6, 2021
    Copy the full SHA
    bd8e8da View commit details

Commits on Aug 7, 2021

  1. style

    eggrobin committed Aug 7, 2021
    Copy the full SHA
    36fe477 View commit details
  2. pinning

    eggrobin committed Aug 7, 2021
    Copy the full SHA
    b4999e1 View commit details
  3. not making the button green

    eggrobin committed Aug 7, 2021
    Copy the full SHA
    02f9ab9 View commit details

Commits on Aug 8, 2021

  1. tooltips

    eggrobin committed Aug 8, 2021
    Copy the full SHA
    4594544 View commit details
  2. height

    eggrobin committed Aug 8, 2021
    Copy the full SHA
    39402bc View commit details
  3. drop the in-window tooltip

    eggrobin committed Aug 8, 2021
    Copy the full SHA
    a5feb4b View commit details
  4. delay

    eggrobin committed Aug 8, 2021
    Copy the full SHA
    f068e33 View commit details
  5. Copy the full SHA
    9d962e9 View commit details
  6. missing localization

    eggrobin committed Aug 8, 2021
    Copy the full SHA
    443e6cb View commit details

Commits on Aug 9, 2021

  1. after pleroy’s review

    eggrobin committed Aug 9, 2021
    Copy the full SHA
    06141ca View commit details
  2. Merge pull request #3087 from eggrobin/frame-selector-ui

    Overhaul the frame selector UI
    eggrobin authored Aug 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d93197e View commit details
5 changes: 3 additions & 2 deletions ksp_plugin_adapter/ksp_plugin_adapter.cs
Original file line number Diff line number Diff line change
@@ -1931,8 +1931,9 @@ private void RenderNavball(Vessel active_vessel) {
// If we are targeting an unmanageable vessel, keep the navball in
// target mode; otherwise, put it in the mode that reflects the
// plotting frame.
if (FlightGlobals.speedDisplayMode !=
FlightGlobals.SpeedDisplayModes.Target) {
if (!(FlightGlobals.speedDisplayMode ==
FlightGlobals.SpeedDisplayModes.Target &&
plotting_frame_selector_.target == null)) {
if (plotting_frame_selector_.IsSurfaceFrame()) {
if (FlightGlobals.speedDisplayMode !=
FlightGlobals.SpeedDisplayModes.Surface) {
22 changes: 14 additions & 8 deletions ksp_plugin_adapter/localization/en-us.cfg
Original file line number Diff line number Diff line change
@@ -40,26 +40,32 @@ Localization {
#Principia_SpeedDisplayText = <<1>> m/s // <<1>>: active_vessel_velocity.magnitude.ToString("F1").

// ReferenceFrameSelector
#Principia_ReferenceFrameSelector_Name_Target = Target Local Vert./Horiz. at <<1>> // <<1>> selected vessel
#Principia_ReferenceFrameSelector_Name_Target = Target-Centred <<1>> Orbit // <<1>> selected vessel
#Principia_ReferenceFrameSelector_Name_BodyCentredNonRotating = <<1>>-Centred Inertial // <<1>> centred body name
#Principia_ReferenceFrameSelector_Name_BarycentricRotating = <<1>>-<<2>> Barycentric // <<1>> centred body name <<2>> secondary body name
#Principia_ReferenceFrameSelector_Name_BodyCentredParentDirection = <<1>>-Centred <<2>>-Aligned // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Name_BodyCentredParentDirection = <<1>>-Centred <<2>> Orbit // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Name_BodySurface = <<1>>-Centred <<1>>-Fixed // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_Target = Tgt LVLH@<<1>> // <<1>> selected vessel (first letter)
#Principia_ReferenceFrameSelector_ShortName_Target = Tgt <<1>>O // <<1>> selected vessel (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredNonRotating = <<1>>CI // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BarycentricRotating = <<1>><<2>>B // <<1> >centred body name (first letter) <<2>> secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredParentDirection = <<1>>C<<2>>A // <<1>> centred body name (first letter) <<2>> secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredParentDirection = <<1>>C<<2>>O // <<1>> centred body name (first letter) <<2>> secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodySurface = <<1>>C<<1>>F // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_Description_Target = Reference frame fixing the target vessel (<<1>>), the plane of its orbit around <<2>>, and the line between them // <<1>> target vessel name <<2>> centre body name
#Principia_ReferenceFrameSelector_Description_BodyCentredNonRotating = Non-rotating reference frame fixing the centre of <<1>> // <<1>> centred body name
#Principia_ReferenceFrameSelector_Description_Heading = <<1>> (<<2>>) reference frame:
#Principia_ReferenceFrameSelector_Description_Target = The target vessel, <<1>>, is fixed.\nThe plane of its orbit around <<2>> is horizontal.\nThe reference frame rotates with the orbit, fixing the direction of <<2>>. // <<1>> target vessel name <<2>> centre body name
#Principia_ReferenceFrameSelector_Description_BodyCentredNonRotating = The centre of <<1>> is fixed.\nIts equator is horizontal.\nThe reference frame does not rotate. // <<1>> centred body name
#Principia_ReferenceFrameSelector_Description_BarycentricRotating = Reference frame fixing the barycentre of <<1>> and <<2>>, the plane in which they move about the barycentre, and the line between them // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodyCentredParentDirection = Reference frame fixing the centre of <<1>>, the plane of its orbit around <<2>>, and the line between them // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodySurface = Reference frame fixing the surface of <<1>> // <<1>>centred body name
#Principia_ReferenceFrameSelector_Description_BodyCentredParentDirection = The centre of <<1>> is fixed.\nThe plane of its orbit around <<2>> is horizontal.\nThe reference frame rotates with the orbit, fixing the direction of <<2>>. // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodySurface = <<1>> is fixed.\nIts equator is horizontal.\nThe reference frame rotates with <<1>>. // <<1>>centred body name
#Principia_ReferenceFrameSelector_ReferencePlane_Centred = equator of <<1>> // <<1>> centred body
#Principia_ReferenceFrameSelector_ReferencePlane_Secondary_Target = the target
#Principia_ReferenceFrameSelector_ReferencePlane = orbit of <<1>> around <<2>> // <<1>> secondary body <<2>> centred body
#Principia_ReferenceFrameSelector_ToggleButton = <<1>> selection (<<2>>)... // <<1>> plotting <<2>> selected frame
#Principia_ReferenceFrameSelector_Title = <<1>> selection (<<2>>) // <<1>> plotting <<2>> selected frame
#Principia_ReferenceFrameSelector_Tooltip_BodyCentredNonRotating = For perturbed Keplerian trajectories around <<1>>.
#Principia_ReferenceFrameSelector_Tooltip_BodySurface = For operations involving the surface of <<1>>: landings, remote sensing, imaging, ground communications, etc.
#Principia_ReferenceFrameSelector_Tooltip_BodyCentredParentDirection = For flybys of <<1>>, transfers to or from it.
#Principia_ReferenceFrameSelector_Tooltip_Target = For intercepts or rendez-vous with the target vessel.
#Principia_ReferenceFrameSelector_Target = Target: <<1>>
#Principia_ReferenceFrameSelector_TargetFrameSelected = Using target-centred frame selected on navball speed display\n\n<<1>> // <<1>> describe when target selected


36 changes: 22 additions & 14 deletions ksp_plugin_adapter/localization/zh-cn.cfg
Original file line number Diff line number Diff line change
@@ -41,26 +41,34 @@ Localization {
#Principia_SpeedDisplayText = <<1>> m/s // <<1>>: active_vessel_velocity.magnitude.ToString("F1").

// ReferenceFrameSelector
#Principia_ReferenceFrameSelector_Name_Target = <<1>>-目标不定参考系 // <<1>> selected vessel
#Principia_ReferenceFrameSelector_Name_BodyCentredNonRotating = <<1>>-惯性参考系 // <<1>> centred body name
#Principia_ReferenceFrameSelector_Name_BarycentricRotating = <<1>>-<<2>>-共同质心旋转参考系 // <<1>> centred body name <<2>> secondary body name
#Principia_ReferenceFrameSelector_Name_BodyCentredParentDirection = <<2>>-<<1>>-单质心旋转参考系 // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Name_BodySurface = <<1>>-地表参考系 // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_Target = Tgt LVLH@<<1>> // <<1>> selected vessel (first letter)
// TODO(egg): translations.
#Principia_ReferenceFrameSelector_Name_Target = Target-Centred <<1>> Orbit // <<1>> selected vessel
#Principia_ReferenceFrameSelector_Name_BodyCentredNonRotating = <<1>>-Centred Inertial // <<1>> centred body name
#Principia_ReferenceFrameSelector_Name_BarycentricRotating = <<1>>-<<2>> Barycentric // <<1>> centred body name <<2>> secondary body name
#Principia_ReferenceFrameSelector_Name_BodyCentredParentDirection = <<1>>-Centred <<2>> Orbit // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Name_BodySurface = <<1>>-Centred <<1>>-Fixed // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_Target = Tgt <<1>>O // <<1>> selected vessel (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredNonRotating = <<1>>CI // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BarycentricRotating = <<1>><<2>>B // <<1>>centred body name (first letter) <<2>>secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredParentDirection = <<1>>C<<2>>A // <<1>>centred body name (first letter) <<2>>secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodySurface = <<1>>C<<1>>F // <<1>>centred body name (first letter)
#Principia_ReferenceFrameSelector_Description_Target = 以(<<2>>)为坐标原点,绘制以(<<1>>)为参考的相对路径 // <<1>> Target vessel name <<2>> Centre body name
#Principia_ReferenceFrameSelector_Description_BodyCentredNonRotating = 以(<<1>>)为坐标原点的非旋转固定质心参考系,绘制相对于此质心的轨迹 // <<1>>centred body name
#Principia_ReferenceFrameSelector_Description_BarycentricRotating = 以(<<1>>-<<2>>)共同质心为坐标原点,参考系关于两者连线旋转,绘制相对于两者共同质心与此连线的轨迹 // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodyCentredParentDirection = 以(<<1>>)质心为坐标原点,参考系关于(<<1>>-<<2>>)连线旋转,绘制相对于(<<1>>)质心与此连线的轨迹 // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodySurface = 以(<<1>>)地表为固定参考,绘制相对于地表的轨迹 // <<1>>centred body name
#Principia_ReferenceFrameSelector_ShortName_BarycentricRotating = <<1>><<2>>B // <<1> >centred body name (first letter) <<2>> secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodyCentredParentDirection = <<1>>C<<2>>O // <<1>> centred body name (first letter) <<2>> secondary body name (first letter)
#Principia_ReferenceFrameSelector_ShortName_BodySurface = <<1>>C<<1>>F // <<1>> centred body name (first letter)
#Principia_ReferenceFrameSelector_Description_Heading = <<1>> (<<2>>) reference frame:
#Principia_ReferenceFrameSelector_Description_Target = The target vessel, <<1>>, is fixed.\nThe plane of its orbit around <<2>> is horizontal.\nThe reference frame rotates with the orbit, fixing the direction of <<2>>. // <<1>> target vessel name <<2>> centre body name
#Principia_ReferenceFrameSelector_Description_BodyCentredNonRotating = The centre of <<1>> is fixed.\nIts equator is horizontal.\nThe reference frame does not rotate. // <<1>> centred body name
#Principia_ReferenceFrameSelector_Description_BarycentricRotating = Reference frame fixing the barycentre of <<1>> and <<2>>, the plane in which they move about the barycentre, and the line between them // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodyCentredParentDirection = The centre of <<1>> is fixed.\nThe plane of its orbit around <<2>> is horizontal.\nThe reference frame rotates with the orbit, fixing the direction of <<2>>. // <<1>> secondary body name <<2>> centred body name
#Principia_ReferenceFrameSelector_Description_BodySurface = <<1>> is fixed.\nIts equator is horizontal.\nThe reference frame rotates with <<1>>. // <<1>>centred body name
#Principia_ReferenceFrameSelector_ReferencePlane_Centred = (<<1>>)的赤道面 // <<1>> centred body
#Principia_ReferenceFrameSelector_ReferencePlane_Secondary_Target = 选中的目标
#Principia_ReferenceFrameSelector_ReferencePlane = (<<1>>)的轨道环绕于<<2>> // <<1>> secondary body <<2>> centred body
#Principia_ReferenceFrameSelector_ToggleButton = <<1>>选择器(<<2>>)... // <<1>> plotting <<2>> selected frame
#Principia_ReferenceFrameSelector_Title = <<1>>选择器(<<2>>) // <<1>>plotting <<2>> selected frame
// TODO(egg): translations.
#Principia_ReferenceFrameSelector_Tooltip_BodyCentredNonRotating = For perturbed Keplerian trajectories around <<1>>.
#Principia_ReferenceFrameSelector_Tooltip_BodySurface = For operations involving the surface of <<1>>: landings, remote sensing, imaging, ground communications, etc.
#Principia_ReferenceFrameSelector_Tooltip_BodyCentredParentDirection = For flybys of <<1>>, transfers to or from it.
#Principia_ReferenceFrameSelector_Tooltip_Target = For intercepts or rendez-vous with the target vessel.
#Principia_ReferenceFrameSelector_Target = 目标:<<1>>
#Principia_ReferenceFrameSelector_TargetFrameSelected = 在导航求上以选中的目标为参考定义速度\n\n<<1>> // <<1>> describe when target selected


Loading