Merge branch 'master' into comms

Browse Source

...

This commit is contained in:

Andrew Cassidy 2019-02-07 21:33:34 -08:00

parent 16c5de5f09 a55c6a48f0

commit 35be6e1216

No known key found for this signature in database

GPG Key ID: 963017B38FD477A1

357 changed files with 10141 additions and 1456 deletions

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

Show Stats 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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga Executable file → Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-25-1.mu

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-2-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-125-additional-2.tga Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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