Merge branch 'develop' into radiators

Browse Source

...

This commit is contained in:

Chris Adderley

2019-08-08 15:18:33 -07:00

parent 75ce1ace02 f1354e7461

commit 5f71248650

199 changed files with 4820 additions and 62 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/Control/restock-rcs-block-1.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 256 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 256 KiB

BIN

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

Binary file not shown.

BIN

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

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/Electrical/restock-solarpanel-gigantor-base-n.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-n.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.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/Engine/blank.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-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/Engine/restock-engine-1875-1.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-2-e.tga Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-e.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3-n.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-3.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4-n.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-4.tga Normal file

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-1875-shrouds-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/Engine/restock-engine-1875-shrouds-1.tga Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 192 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 192 KiB

BIN

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

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

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-separatron-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-twitch-2.mu

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-1.dds

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.dds

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-foil-tanks-silver-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-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

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-5.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-1875-4.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-3.tga

Binary file not shown.

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

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1-b.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-beam-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-2.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-girder-beam-wide-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panel-1.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-1.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-n.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1-s.tga Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-gold-1.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-panels-foil-silver-1.tga Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-1.mu Normal file

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-0625-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-adapter-125-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-hub-1.mu Normal file

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-1.mu

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Utility/restock-ladder-extending-2.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

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