Skip to content

Commit b7b3332

Browse files
DMagic1DMagic1
committed
Merge pull request #100 from DMagic1/dev
Version 9rc4.1
2 parents fb9804e + 8f0dd1d commit b7b3332

File tree

12 files changed

+58
-46
lines changed

12 files changed

+58
-46
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,11 +503,11 @@ sneaky then they can of course be sneaky.
503503
[shield:support-rpm]: http://img.shields.io/badge/works%20with%20RPM-v0.18.3-a31f34.svg
504504
[shield:support-ket]: http://img.shields.io/badge/works%20with%20Kethane-v0.9.2-brightgreen.svg
505505
[shield:support-orsx]: http://img.shields.io/badge/works%20with%20ORSX-v0.1.2-000000.svg
506-
[shield:support-mm]: http://img.shields.io/badge/works%20with%20MM-v2.5.1-40b7c0.svg
507-
[shield:support-toolbar]: http://img.shields.io/badge/works%20with%20Blizzy's%20Toolbar-1.7.7-7c69c0.svg
506+
[shield:support-mm]: http://img.shields.io/badge/works%20with%20MM-v2.5.5-40b7c0.svg
507+
[shield:support-toolbar]: http://img.shields.io/badge/works%20with%20Blizzy's%20Toolbar-1.7.8-7c69c0.svg
508508
[shield:support-alcor]: http://img.shields.io/badge/works%20with%20ALCOR-0.9-299bc7.svg
509509
[shield:support-kspi]: http://img.shields.io/badge/works%20with%20Interstellar-0.13-a62374.svg
510-
[shield:support-usi]:http://img.shields.io/badge/works%20with%20USI-0.22-34c566.svg
510+
[shield:support-usi]:http://img.shields.io/badge/works%20with%20USI-0.22.1-34c566.svg
511511
[shield:support-karbonite]: http://img.shields.io/badge/works%20with%20Karbonite-0.5-ff8c00.svg
512512
[shield:support-epl]: http://img.shields.io/badge/works%20with%20EPL-4.2.3-ff8c00.svg
513513
[shield:support-ctt]: http://img.shields.io/badge/works%20with%20CTT-1.1-blue.svg

‎SCANassets/SCANsat.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"MAJOR":1,
1212
"MINOR":0,
1313
"PATCH":9,
14-
"BUILD":3
14+
"BUILD":41
1515
},
1616
"KSP_VERSION":{
1717
"MAJOR":0,

‎SCANsat/CHANGELOG.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
Version 9.4 - 2014-12-16
1+
Version 9.4.1 - 2014-12-22
2+
------------------------
3+
4+
- Fix for orbit overlays on the first tier tracking station
5+
6+
Version 9.4 - 2014-12-19
27
------------------------
38

49
- Updated for KSP 0.90

‎SCANsat/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1717
[assembly: AssemblyVersion ("1.0.8.0")]
1818
[assembly: AssemblyFileVersion ("1.0.9.0")]
19-
[assembly: AssemblyInformationalVersion ("v9rc4")]
19+
[assembly: AssemblyInformationalVersion ("v9rc4.1")]
2020

2121
[assembly: KSPAssembly ("SCANsat", 0, 9)]
2222

‎SCANsat/SCAN_UI/SCANcolorSelection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ protected override void DrawWindowPost(int id)
317317
//Draw the version label in the upper left corner
318318
private void versionLabel(int id)
319319
{
320-
Rect r = new Rect(6, 0, 40, 18);
320+
Rect r = new Rect(6, 0, 50, 18);
321321
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
322322
}
323323

‎SCANsat/SCAN_UI/SCANinstrumentUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected override void DrawWindow(int id)
106106
//Draw the version label in the upper left corner
107107
private void versionLabel(int id)
108108
{
109-
Rect r = new Rect(4, 0, 40, 18);
109+
Rect r = new Rect(4, 0, 50, 18);
110110
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
111111
}
112112

‎SCANsat/SCAN_UI/SCANkscMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ protected override void DrawWindowPost(int id)
223223
//Draw version label in upper left corner
224224
private void versionLabel(int id)
225225
{
226-
Rect r = new Rect(6, 0, 40, 18);
226+
Rect r = new Rect(6, 0, 50, 18);
227227
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
228228
}
229229

‎SCANsat/SCAN_UI/SCANmainMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected override void DrawWindow(int id)
9595
//Print the version number
9696
private void versionLabel(int id)
9797
{
98-
Rect r = new Rect(6, 0, 40, 18);
98+
Rect r = new Rect(6, 0, 50, 18);
9999
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
100100
}
101101

‎SCANsat/SCAN_UI/SCANnewBigMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ protected override void DrawWindowPost(int id)
220220
//Draw version label in upper left corner
221221
private void versionLabel(int id)
222222
{
223-
Rect r = new Rect(6, 0, 40, 18);
223+
Rect r = new Rect(6, 0, 50, 18);
224224
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
225225
}
226226

‎SCANsat/SCAN_UI/SCANsatRPM.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,14 @@ public bool MapRenderer(RenderTexture screen, float cameraAspect)
241241
DrawOrbitIcon(vessel, MapIcons.OtherIcon.DN, iconColorANDNValue, vessel.orbit.TimeOfDescendingNode(targetVessel.orbit, start));
242242
}
243243
// And the maneuver node and post-maneuver orbit:
244-
ManeuverNode node = vessel.patchedConicSolver.maneuverNodes.Count > 0 ? vessel.patchedConicSolver.maneuverNodes[0] : null;
245-
if (node != null) {
246-
DrawOrbit(vessel, node.nextPatch, node.UT, iconColorNodeValue);
247-
DrawOrbitIcon(vessel, MapIcons.OtherIcon.NODE, iconColorNodeValue, node.UT);
244+
if (vessel.patchedConicSolver != null)
245+
{
246+
ManeuverNode node = vessel.patchedConicSolver.maneuverNodes.Count > 0 ? vessel.patchedConicSolver.maneuverNodes[0] : null;
247+
if (node != null)
248+
{
249+
DrawOrbit(vessel, node.nextPatch, node.UT, iconColorNodeValue);
250+
DrawOrbitIcon(vessel, MapIcons.OtherIcon.NODE, iconColorNodeValue, node.UT);
251+
}
248252
}
249253
}
250254
// Own icon goes above that

‎SCANsat/SCAN_UI/SCANsettingsUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected override void DrawWindowPost(int id)
133133
//Draw the version label in the upper left corner
134134
private void versionLabel(int id)
135135
{
136-
Rect r = new Rect(6, 0, 40, 18);
136+
Rect r = new Rect(6, 0, 50, 18);
137137
GUI.Label(r, SCANversions.SCANsatVersion, SCANskins.SCAN_whiteReadoutLabel);
138138
}
139139

‎SCANsat/SCAN_UI/UI_Framework/SCANuiUtil.cs

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -631,41 +631,44 @@ internal static void drawOrbit(Rect maprect, SCANmap map, Vessel vessel, double
631631
return;
632632

633633
// show first maneuver node
634-
if (vessel.patchedConicSolver.maneuverNodes.Count > 0)
634+
if (vessel.patchedConicSolver != null)
635635
{
636-
ManeuverNode n = vessel.patchedConicSolver.maneuverNodes[0];
637-
if (n.patch == vessel.orbit && n.nextPatch != null && n.nextPatch.activePatch && n.UT > startUT - o.period && mapPosAtT(maprect, map, ref r, vessel, o, n.UT - startUT, startUT))
636+
if (vessel.patchedConicSolver.maneuverNodes.Count > 0)
638637
{
639-
col = palette.cb_reddishPurple;
640-
if (SCANcontroller.controller.colours != 1)
641-
col = palette.xkcd_PurplyPink;
642-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.ManeuverNode, col, 32, true);
643-
Orbit nuo = n.nextPatch;
644-
for (int i = 0; i < steps; ++i)
638+
ManeuverNode n = vessel.patchedConicSolver.maneuverNodes[0];
639+
if (n.patch == vessel.orbit && n.nextPatch != null && n.nextPatch.activePatch && n.UT > startUT - o.period && mapPosAtT(maprect, map, ref r, vessel, o, n.UT - startUT, startUT))
645640
{
646-
double T = n.UT - startUT + i * nuo.period / steps;
647-
if (T + startUT > nuo.EndUT)
648-
break;
649-
if (mapPosAtT(maprect, map, ref r, vessel, nuo, T, startUT))
641+
col = palette.cb_reddishPurple;
642+
if (SCANcontroller.controller.colours != 1)
643+
col = palette.xkcd_PurplyPink;
644+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.ManeuverNode, col, 32, true);
645+
Orbit nuo = n.nextPatch;
646+
for (int i = 0; i < steps; ++i)
650647
{
651-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Planet, col, 8, false);
648+
double T = n.UT - startUT + i * nuo.period / steps;
649+
if (T + startUT > nuo.EndUT)
650+
break;
651+
if (mapPosAtT(maprect, map, ref r, vessel, nuo, T, startUT))
652+
{
653+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Planet, col, 8, false);
654+
}
655+
}
656+
if (nuo.patchEndTransition == Orbit.PatchTransitionType.ESCAPE)
657+
{
658+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Exit, col, 32, true);
659+
}
660+
else if (nuo.patchEndTransition == Orbit.PatchTransitionType.ENCOUNTER)
661+
{
662+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Encounter, col, 32, true);
663+
}
664+
if (nuo.timeToAp > 0 && n.UT + nuo.timeToAp < nuo.EndUT && mapPosAtT(maprect, map, ref r, vessel, nuo, n.UT - startUT + nuo.timeToAp, startUT))
665+
{
666+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Ap, col, 32, true);
667+
}
668+
if (nuo.timeToPe > 0 && n.UT + nuo.timeToPe < nuo.EndUT && mapPosAtT(maprect, map, ref r, vessel, nuo, n.UT - startUT + nuo.timeToPe, startUT))
669+
{
670+
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Pe, col, 32, true);
652671
}
653-
}
654-
if (nuo.patchEndTransition == Orbit.PatchTransitionType.ESCAPE)
655-
{
656-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Exit, col, 32, true);
657-
}
658-
else if (nuo.patchEndTransition == Orbit.PatchTransitionType.ENCOUNTER)
659-
{
660-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Encounter, col, 32, true);
661-
}
662-
if (nuo.timeToAp > 0 && n.UT + nuo.timeToAp < nuo.EndUT && mapPosAtT(maprect, map, ref r, vessel, nuo, n.UT - startUT + nuo.timeToAp, startUT))
663-
{
664-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Ap, col, 32, true);
665-
}
666-
if (nuo.timeToPe > 0 && n.UT + nuo.timeToPe < nuo.EndUT && mapPosAtT(maprect, map, ref r, vessel, nuo, n.UT - startUT + nuo.timeToPe, startUT))
667-
{
668-
SCANicon.drawOrbitIcon((int)r.x, (int)r.y, SCANicon.OrbitIcon.Pe, col, 32, true);
669672
}
670673
}
671674
}

0 commit comments

Comments
 (0)