Merge branch 'develop' into structural-part-2

Browse Source

...

This commit is contained in:

Chris Adderley

2019-06-11 14:42:42 -07:00

committed by GitHub

parent 067e3f4366 ee2804f379

commit c21df64865

39 changed files with 681 additions and 6 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/DepthMasks/restock-coneintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-fanintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-inlineintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-longintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-miniintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-radialintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/DepthMasks/restock-rampintake-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-1-n.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-compoundparts-1.dds Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-fuelline-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/CompoundParts/restock-strut-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-3x2-shrouded.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-basicjet-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-minijet-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-ramjet-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/DepthMasks/restock-turbojet-mask.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static.mu → Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-2.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-static-3.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladders-1.tga

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 MiB After Width:  |  Height:  |  Size: 1.0 MiB