Merge branch 'Feature_74' into dev

KSP-RO · May 17, 2015 · 406b217 · 406b217
2 parents 2d0ff2f + a50ab57
commit 406b217
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.3.0.15](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.15) (2015-05-17)
+
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.13...1.3.0.15)
+
 ## [1.3.0.13](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.13) (2015-05-16)
 
 [Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.12...1.3.0.13)
@@ -54,7 +58,11 @@
 
 ## [1.3.0.8](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.8) (2015-04-28)
 
-[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.5...1.3.0.8)
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.14...1.3.0.8)
+
+## [1.3.0.14](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.14) (2015-04-28)
+
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.5...1.3.0.14)
 
 ## [1.3.0.5](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.5) (2015-04-28)
 
@@ -74,15 +82,15 @@
 
 ## [1.3E1](https://github.com/jwvanderbeck/TestFlight/tree/1.3E1) (2015-03-19)
 
-[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.2.2.0...1.3E1)
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.1...1.3E1)
 
-## [1.2.2.0](https://github.com/jwvanderbeck/TestFlight/tree/1.2.2.0) (2015-03-14)
+## [1.3.0.1](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.1) (2015-03-14)
 
-[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.3.0.1...1.2.2.0)
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.2.2.0...1.3.0.1)
 
-## [1.3.0.1](https://github.com/jwvanderbeck/TestFlight/tree/1.3.0.1) (2015-03-14)
+## [1.2.2.0](https://github.com/jwvanderbeck/TestFlight/tree/1.2.2.0) (2015-03-14)
 
-[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.2.1.0...1.3.0.1)
+[Full Changelog](https://github.com/jwvanderbeck/TestFlight/compare/1.2.1.0...1.2.2.0)
 
 ## [1.2.1.0](https://github.com/jwvanderbeck/TestFlight/tree/1.2.1.0) (2015-02-28)
 

diff --git a/GameData/TestFlight/Plugins/TestFlight.dll b/GameData/TestFlight/Plugins/TestFlight.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightAPI.dll b/GameData/TestFlight/Plugins/TestFlightAPI.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightContracts.dll b/GameData/TestFlight/Plugins/TestFlightContracts.dll
diff --git a/GameData/TestFlight/Plugins/TestFlightCore.dll b/GameData/TestFlight/Plugins/TestFlightCore.dll
diff --git a/TestFlightCore/TestFlightCore/TestFlightCore.cs b/TestFlightCore/TestFlightCore/TestFlightCore.cs
@@ -62,7 +62,7 @@ public class TestFlightCore : PartModuleExtended, ITestFlightCore
 
         // These were created for KCT integration but might have other uses
         private float dataRateLimiter = 1.0f;
-        private float dataCap = float.MaxValue;
+        private float dataCap = 1.0f;
 
         public bool TestFlightEnabled
         {
@@ -501,8 +501,8 @@ public float ModifyFlightData(float modifier, bool additive)
             {
                 newFlightData *= modifier;
             }
-            if (newFlightData > dataCap)
-                newFlightData = dataCap;
+            if (newFlightData > (maxData * dataCap))
+                newFlightData = maxData * dataCap;
 
             if (newFlightData > maxData)
                 newFlightData = maxData;