Skip to content

Commit

Permalink
Merge pull request #67 from DMagic1/dev
Browse files Browse the repository at this point in the history
Version 1.3.6
  • Loading branch information
DMagic1 authored Nov 4, 2016
2 parents c0deae5 + 7e81f54 commit d9db5f5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
5 changes: 4 additions & 1 deletion GameData/DMagicOrbitalScience/Change Log.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
v1.3.5
v1.3.6
- Fix bug preventing SIGINT from working as a comms antenna

v1.3.5
- Update for KSP 1.2.1

- Fix bug in anomaly scanner when loading with an anomaly nearby
Expand Down
4 changes: 2 additions & 2 deletions GameData/DMagicOrbitalScience/DMagicOrbitalScience.version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"NAME":"DMagic Orbital Science",
"URL":"https://raw.githubusercontent.com/DMagic1/Orbital-Science/master/GameData/DMagicOrbitalScience/DMagicOrbitalScience.version",
"DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.5",
"DOWNLOAD":"https://spacedock.info/mod/128/DMagic%20Orbital%20Science/download/1.3.6",
"GITHUB":{
"USERNAME":"DMagic1",
"REPOSITORY":"Orbital-Science",
Expand All @@ -11,7 +11,7 @@
"MAJOR":1,
"MINOR":3,
"PATCH":0,
"BUILD":5
"BUILD":6
},
"KSP_VERSION":{
"MAJOR":1,
Expand Down
5 changes: 4 additions & 1 deletion Source/Part Modules/DMSIGINT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public override void OnStart(PartModule.StartState state)
if (IsDeployed)
{
deployScalar = 1;
scalar = 1;
return;
}

Expand Down Expand Up @@ -249,6 +250,7 @@ public override void deployEvent()
}

deployScalar = 1;
scalar = 1;

base.deployEvent();
}
Expand All @@ -259,6 +261,7 @@ public override void retractEvent()
return;

deployScalar = 0;
scalar = 0;

base.retractEvent();
}
Expand Down Expand Up @@ -382,7 +385,7 @@ public void SetScalar(float t)
{
if (oneShot && isLocked)
{
scalar = t;
scalar = 1;
deployScalar = 1;
moving = false;

Expand Down
6 changes: 3 additions & 3 deletions Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5428988e-53a6-4d8e-8af4-014572513e22")]

[assembly: AssemblyVersion("1.3.0.5")]
[assembly: AssemblyFileVersion("1.3.0.5")]
[assembly: AssemblyInformationalVersion("v1.3.5")]
[assembly: AssemblyVersion("1.3.0.6")]
[assembly: AssemblyFileVersion("1.3.0.6")]
[assembly: AssemblyInformationalVersion("v1.3.6")]
[assembly: KSPAssembly("DMagic", 1, 4)]

0 comments on commit d9db5f5

Please sign in to comment.