Merge branch 'master' into develop

4 years ago · ffc6c2d5c9
parent 04ef450d2f c490319da2
commit ffc6c2d5c9
297 changed files with 20866 additions and 4684 deletions
--- a/Assets/CineboxAndrew
+++ b/Assets/CineboxAndrew
@ -1 +1 @@
-Subproject commit e0d84f6229971bab4b1557380a1f3b9c39e2ac46
+Subproject commit 45d8f3f43b478f7bbbd41f02252ed867e3dea703
--- a/Assets/Well/Restock-kv1-pod/Restock_KV1_Soviet_Pod.unity
+++ b/Assets/Well/Restock-kv1-pod/Restock_KV1_Soviet_Pod.unity
--- a/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-e.psd
+++ b/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-e.psd
--- a/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-n.psd
+++ b/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-n.psd
--- a/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1.psd
+++ b/Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1.psd
--- a/Assets/Well/Restock-kv1-pod/restock-kv1-pod-1.blend
+++ b/Assets/Well/Restock-kv1-pod/restock-kv1-pod-1.blend
--- a/Assets/Well/Restock-kv1-pod/restock-kv2-pod-1.blend
+++ b/Assets/Well/Restock-kv1-pod/restock-kv2-pod-1.blend
--- a/Assets/Well/Restock-kv1-pod/restock-kv3-pod-1.blend
+++ b/Assets/Well/Restock-kv1-pod/restock-kv3-pod-1.blend
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-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/Coupling/blank-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds
--- 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-4-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-375-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-375-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1.dds
--- 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-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-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-1875-shrouds-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised.dds
--- 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-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-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.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-e.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-e.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-3.dds
--- 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-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-skipper-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.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-endcap-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-3.mu
--- 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-5-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-3.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-3.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-4.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-4.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-375-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-375-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-25-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-25-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3-n.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3.dds
--- a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-0625.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-0625.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-125.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-125.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-1875.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-1875.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-25.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-25.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-375.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-375.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-5.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-5.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-0625-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-0625-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-125-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-125-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-25-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-25-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-375-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-375-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-5-1.mu
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-5-1.mu
--- a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tubes-1-n.dds
+++ b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tubes-1-n.dds
--- a/Show More
+++ b/Show More