Merge branch 'master' into develop

Browse Source

...

This commit is contained in:

Andrew Cassidy

2020-05-11 23:51:22 -07:00

parent 04ef450d2f c490319da2

commit ffc6c2d5c9

297 changed files with 21475 additions and 5293 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

Assets/CineboxAndrew

Submodule Assets/CineboxAndrew updated: e0d84f6229...45d8f3f43b

1244

Assets/Well/Restock-kv1-pod/Restock_KV1_Soviet_Pod.unity Normal file

File diff suppressed because it is too large Load Diff

BIN

Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-e.psd Normal file

Binary file not shown.

BIN

Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1-n.psd Normal file

Binary file not shown.

BIN

Assets/Well/Restock-kv1-pod/Textures/restock-kv1-pod-1.psd Normal file

Binary file not shown.

BIN

Assets/Well/Restock-kv1-pod/restock-kv1-pod-1.blend Normal file

Binary file not shown.

BIN

Assets/Well/Restock-kv1-pod/restock-kv2-pod-1.blend Normal file

Binary file not shown.

BIN

Assets/Well/Restock-kv1-pod/restock-kv3-pod-1.blend Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-rovemate-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/blank-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/blank.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4-e.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-4.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-1875-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-25-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-375-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplate-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-engineplates-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-e.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-1.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-1.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-3.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-e.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil-s.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-foil.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-revised.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds-1-n.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-2-shrouds.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-caravel-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-glow-basic-1.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-e.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-2.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mastodon-3.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-panda-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-schnauzer-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ursa-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-5-3.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-25-2.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-3.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-4.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-endcap-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-adapter-375-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-25-1.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-3.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-0625.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-125.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-1875.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-25.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-375.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-collider-tube-5.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-0625-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-25-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-375-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-5-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tubes-1-n.dds Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More