Merge branch 'master' into comms

Browse Source

...

This commit is contained in:

Andrew Cassidy

2018-12-29 22:09:28 -08:00

parent 2f33c71628 14f7849e78

commit 16c5de5f09

77 changed files with 1945 additions and 1017 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-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/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/Electrical/restock-light-flood-1.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.tga Normal file

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-shrouds-1-n.tga Normal file

Binary file not shown.

BIN

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

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/FuelTank/restock-adapter-375-fueled-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-mk2-short-n.dds Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-2.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga 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-alt-n.tga Normal file

Binary file not shown.

BIN

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

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

Binary file not shown.

BIN

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

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.