Merge pull request #952 from PorktoberRevolution/master

Release 1.3.2

Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg

@@ -149,8 +149,8 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Fairing, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 1.44,0.9625,0.1822, 1.44,0.964,0.3017, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355
+    cube = Fairing, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 1.435,0.9658,0.1822, 1.435,0.9675,0.3017, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355
-    cube = Clean, 0.1825,0.4643,0.7229, 0.1825,0.4643,0.7229, 1.274,0.9542,0.1829, 1.274,0.9475,0.2177, 0.1825,0.4628,0.7229, 0.1825,0.4658,0.7229, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275
+    cube = Clean, 0.181,0.468,0.7344, 0.181,0.468,0.7344, 1.27,0.9574,0.1829, 1.27,0.9507,0.2177, 0.181,0.4664,0.7344, 0.181,0.4695,0.7344, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275
   }
 }
 
@@ -216,10 +216,11 @@
     excludedRenderer = HeatShield25Fairing
     excludedRenderer = HeatShieldInternals
   }
+  !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Fairing, 1.436,0.7472,1.355, 1.436,0.7472,1.355, 5.341,0.9614,0.259, 5.341,0.9714,0.4709, 1.436,0.7472,1.355, 1.436,0.7471,1.355, 0,-0.1004,0, 2.609,0.5505,2.609
+    cube = Fairing, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 5.323,0.9648,0.259, 5.323,0.9747,0.4709, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 0,-0.1004,0, 2.609,0.5505,2.609
-    cube = Clean, 0.7091,0.4621,1.346, 0.7091,0.4621,1.346, 4.998,0.9524,0.2587, 4.998,0.9466,0.3249, 0.7091,0.4605,1.346, 0.7091,0.4638,1.346, 0,0.01104,0, 2.525,0.3277,2.525
+    cube = Clean, 0.7025,0.4649,1.357, 0.7025,0.4649,1.357, 4.982,0.9555,0.2587, 4.982,0.9499,0.327, 0.7025,0.4634,1.357, 0.7025,0.4665,1.357, 0,0.01104,-3.947E-09, 2.525,0.3277,2.525
   }
 }
 
@@ -233,11 +234,6 @@
   {
     model = ReStock/Assets/Aero/restock-heatshield-375-1
   }
-  DRAG_CUBE
-  {
-    cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.48,0.9608,0.3456, 12.48,0.9621,0.6953, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99
-    cube = Clean, 1.563,0.4576,1.952, 1.563,0.4576,1.952, 11.03,0.9547,0.3365, 11.03,0.9465,0.4361, 1.563,0.456,1.952, 1.563,0.459,1.952, 0,0.01101,0, 3.75,0.4864,3.75
-  }
   @MODULE[ModuleJettison]
   {
     @jettisonName = HeatShield375Fairing
@@ -289,6 +285,12 @@
     excludedRenderer = HeatShield375Fairing
     excludedRenderer = HeatShield375Internal
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.44,0.9645,0.3456, 12.44,0.9656,0.6994, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99
+    cube = Clean, 1.549,0.4589,1.967, 1.549,0.4589,1.967, 10.99,0.9578,0.3365, 10.99,0.9498,0.4388, 1.549,0.4573,1.967, 1.549,0.4603,1.967, 0,0.01101,-3.936E-09, 3.75,0.4864,3.75
+  }
 }
 
 // Heat Shield (10m)
@@ -305,4 +307,10 @@
   {
     @animationName = Inflate
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = A, 19.07,0.4872,8.728, 19.07,0.4871,8.728, 72.75,0.8279,2.352, 71.74,0.8437,2.415, 18.75,0.4822,9.129, 18.75,0.5195,9.129, -4.768E-07,0.9913,4.768E-07, 8.528,3.025,9.074
+    cube = B, 5.042,0.7795,4.677, 5.042,0.7795,4.677, 4.271,0.8684,4.235, 3.585,0.6972,0.9259, 5.008,0.7754,4.212, 5.008,0.7758,4.212, -4.768E-07,2.057,0, 6.815,4.172,5.902
+  }
 }

Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg

@@ -63,4 +63,10 @@
     excludedRenderer = HeatShield1875Fairing
     excludedRenderer = HeatShieldInternals
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957
+    cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894
+  }
 }

Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg

@@ -89,6 +89,7 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-pollux-running
   }
+  
   MODULE
   {
     name = FXModuleThrottleEffects

Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg

@@ -1,10 +0,0 @@
-// Disables Restock patches for stock parts.
-// IMPORTANT NOTE: YOU WILL ALSO NEED TO WHITELIST THE PARTS' ART ASSETS
-
-// To use, uncomment the following @PART entry, and change yourPartName to the part that you want Restock to leave alone :(.
-// Make a copy with an appropriate value for yourPartName
-
-// @PART[yourPartName]:BEFORE[000_ReStock]
-//{
-//  RestockIgnore = True
-//}

Distribution/Restock/GameData/ReStock/Versioning/ReStock.version

@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":11,
-        "PATCH":1
+        "PATCH":2
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

Distribution/Restock/changelog.txt

@@ -1,3 +1,9 @@
+v1.3.2
+------
+- Fixed collider location inconsistency with stock for 1.25m heatshield (#914)
+- Fixed drag cubes (and occlusion) for 1.875m heatshield (#923)
+- Added new FX transform nodes for Poodle
+
 v1.3.1
 ------
 - Fixed small linear RCS collider

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.3.1
+RESTOCK 1.3.2
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg

@@ -347,4 +347,9 @@ PART
     nodeEnabled = True
     attachNodeName = bottom
   }
+  DRAG_CUBE
+  {
+    cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957
+    cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg

@@ -19,7 +19,7 @@
   MODULE
   {
     name = ModuleGimbal
-    gimbalTransformName = B_Gimbal
+    gimbalTransformName = Gimbal
     gimbalRange = 3
     gimbalResponseSpeed = 8
     useGimbalResponseSpeed = true

Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version

@@ -6,14 +6,14 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":1,
+        "PATCH":2,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":11,
-        "PATCH":1
+        "PATCH":2
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

Distribution/RestockPlus/changelog.txt

@@ -1,3 +1,8 @@
+v1.3.2
+------
+- Fixed drag cubes (and occlusion) for 1.875m heatshield (#923)
+- Fixed SRB gimbal patch not functioning correctly on MH Pollux (#951)
+
 v1.3.1
 ------
 - Updated French localization  (vinix38)

Distribution/RestockPlus/readme.txt

@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.3.1
+RESTOCK+ 1.3.2
 ==============
 
 Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@@ -21,7 +21,7 @@ DEPENDENCIES
 ============
 
 Required:
-- Restock (1.3.1)
+- Restock (1.3.2)
 - ModuleManager (4.1.4)
 
 =============