Merge pull request #897 from PorktoberRevolution/master

Release 1.2.0
2024-09-01 17:34:42 +00:00 · 2020-08-20 20:41:40 -07:00 · 2020-08-20 20:41:40 -07:00 · 6db20ee793
commit 6db20ee793
parent 43c13e7608 1349fbb57c
341 changed files with 5388 additions and 497 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,8 @@ build-deploy/
 bin/
 obj/
 *.swp
+
+Distribution/Restock/GameData/ReStock/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
+Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
--- a/Assets/CineboxAndrew
+++ b/Assets/CineboxAndrew
@ -1 +1 @@
-Subproject commit 45d8f3f43b478f7bbbd41f02252ed867e3dea703
+Subproject commit 582cb1fa8eb791ebdafac579c3f1f251f806b844
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-pod.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-pod-sphere-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto2-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto2-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-qube-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-qube-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rovemate-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rovemate-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rover-foil-1.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-compoundparts-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-2.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/Coupling/restock-airlock-inflatable-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-airlock-inflatable-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-2.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-claw-625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625.dds
--- 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-decoupler-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds
--- 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-decouplers-5-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-5-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-5.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-5.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-6-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-6-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-6.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-6.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.png
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.png
--- 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/Coupling/restock-separator-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-poodle-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-kickback-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-kickback-2.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/FuelTank/restock-adapter-375-fueled-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-4.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-4.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_goldSpecular.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_goldSpecular.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_goldSpecular25.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_goldSpecular25.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_silverSpecular.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/FairingsMat_silverSpecular.dds
--- a/Show More
+++ b/Show More