Merge branch 'master' into fairings

Browse Source

...

This commit is contained in:

Chris Adderley

2019-01-12 20:59:44 -08:00

parent 3b32737e20 32e48a90d5

commit b0e645a094

81 changed files with 1852 additions and 847 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

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt-b.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-2-b.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-3-b.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-b.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk3-1-pod.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-revised-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1-shrouds.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-puff-ant-1.tga

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-rhino-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-rhino-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-125-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.tga

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-twinboar-1.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu

Binary file not shown.