Merge branch 'master' into science-comms

Browse Source

...

This commit is contained in:

Andrew Cassidy

2018-12-01 19:57:12 -08:00

parent 6920667ac9 c9da8a9fb3

commit 6b9708221c

98 changed files with 1717 additions and 30 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 Normal file

Binary file not shown.

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-b.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-b.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/Coupling/restock-docking-0625-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-e.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1-n.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-2-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-2-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-batteries-2.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-0625-1.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-radial-med-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-battery-radial-small-1.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

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-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-shroud-375-1.tga

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-srb-1.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-variants-1.tga 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-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/Engine/restock-engine-vector-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-solid-1.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-25-1.tga

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-375-1.tga

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-375-2.tga

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-xenon-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-xenon-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Payload/restock-service-bay-25-1.mu Normal file

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-125-0625-2.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-cubic-strut.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-micro-1.tga

Binary file not shown.