Merge branch 'master' into restockplus-375m

Browse Source

...

This commit is contained in:

Chris Adderley

2019-01-22 11:09:21 -08:00

parent 1bd3440bc8 485710ed47

commit be020515d5

350 changed files with 7060 additions and 1010 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-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-2-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-3-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-0625-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-25-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-375-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga Normal file

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-drone-core-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-drone-core-25-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-drone-cores-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-drone-cores-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-drone-cores-1.tga Normal file

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-engine-boar-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-grey-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-hatch-common-round-white-1.mu Normal file

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/Command/restock-probe-1-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-silver.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs2-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs21.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-okto2-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-qube-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-sphere-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-b.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5-n.tga Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5.tga Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-5.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-3.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1-n.tga Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 MiB

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1.tga Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 MiB

BIN

Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625.mu Normal file

Binary file not shown.

0

Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga → Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-e.tga

0

Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga → Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.tga

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1-n.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

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