Merge branch 'negative-space' into develop

2024-09-01 17:34:42 +00:00 · 2019-06-13 23:21:50 -07:00
parent 13e83931b3 2af55cb675
commit 4ac9b1d69a
15 changed files with 18 additions and 23 deletions
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-coneintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-coneintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-fanintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-fanintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-inlineintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-inlineintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-longintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-longintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-miniintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-miniintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-radialintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-radialintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-rampintake-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-rampintake-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-basicjet-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-basicjet-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-minijet-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-minijet-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-ramjet-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-ramjet-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-turbojet-mask.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-turbojet-mask.mu
--- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
@ -129,6 +129,7 @@
  MODULE
  {
    name = ModuleRestockDepthMask
+    shaderName = Depth Mask
    maskTransform = radialintake_mask
  }
 }
--- a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
+++ b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll