Merge branch 'master' of https://github.com/PorktoberRevolution/ReStocked.git

5 years ago · 2f13d09a83
parent 00c1890938 c7f653bc00
commit 2f13d09a83
493 changed files with 15927 additions and 163 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 c262ab1a8477caec6a2ef1961157aed5e2dbd3c5
--- 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/Aero/restock-heat-shield-1875-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1875-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-2.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-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/Coupling/restock-claw-125-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-apu-radial-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-apu-radial-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcell-radial-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-fuelcells-1.dds
--- 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.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/restock-engine-125-additional-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-3-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-3-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-2-shrouds.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-2-shrouds.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-b.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds-b.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu
--- 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-les-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mallet-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mallet-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu
--- 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-poodle-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-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-pug-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-pug-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu
--- 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-shroud-0625-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-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/Show More
+++ b/Show More