Merge branch 'develop' into radiators

5 years ago · 5f71248650
parent 75ce1ace02 f1354e7461
commit 5f71248650
199 changed files with 4820 additions and 62 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,5 +3,7 @@ deploy/
 build/
 build-deploy/
 .vs/
+.idea/
 bin/
 obj/
+*.swp
--- a/Assets/CineboxAndrew
+++ b/Assets/CineboxAndrew
@ -1 +1 @@
-Subproject commit c40a3155dbfcdcb8d1f37cd6cd9ed4129f703124
+Subproject commit e07a544f43258f6ca20819fe598739a6366d9548
--- 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/CompoundParts/restock-compoundparts-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-fuelline-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-fuelline-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-strut-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-strut-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-vernor-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-vernor-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-3x2-shrouded.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-3x2-shrouded.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.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/Assets/Engine/blank.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/blank.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-caravel-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-caravel-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-methalox-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-panda-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-panda-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1-e.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1-e.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-schnauzer-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-schnauzer-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twitch-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twitch-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ursa-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ursa-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1-s.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1-s.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1-s.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1-s.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-5.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-5.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-4.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-4.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-b.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-b.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-wide-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-wide-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panel-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panel-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panel-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panel-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-s.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-s.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1-s.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1-s.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1-n.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1-n.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1.tga
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1.tga
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-0625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-0625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-hub-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-hub-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-2.mu
--- a/Show More
+++ b/Show More