Merge branch '1-8-updates' into develop

Browse Source

# Conflicts:
#	Distribution/Restock/changelog.txt

...

This commit is contained in:

ChrisAdderley 2019-10-19 15:54:09 -07:00

parent 42d4d13310 07d080af8d

commit 90437519e9

157 changed files with 3430 additions and 129 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-nosecone-1875-1-n.tga Normal file

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-1875-1.tga Normal file

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.tga Normal file

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.tga Normal file

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.tga Normal file

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.tga Normal file

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-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/Engine/restock-engine-125-additional-1-n.tga Normal file

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

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

View 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-e.tga

View File

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/Engine/restock-engine-1875-1-n.tga

View File

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/Engine/restock-engine-1875-1.tga

View File

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/Engine/restock-engine-1875-shrouds-1-n.tga

View File

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/Engine/restock-engine-1875-shrouds-1.tga

View File

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/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.dds

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-25-2-shrouds.tga Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-3-shrouds.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-glow-basic-1.tga

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

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

View File

Binary file not shown.

BIN

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

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-shroud-0625-1.dds

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.dds

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

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

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Engine/restock-srb-anvil-1.mu Normal file

View File

Binary file not shown.

BIN

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

View File

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/FuelTank/restock-fueltank-1875-1.mu

View File

Binary file not shown.

BIN

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

View File

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/FuelTank/restock-fueltank-1875-2-n.tga

View File

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/FuelTank/restock-fueltank-1875-2.tga

View File

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/FuelTank/restock-fueltank-1875-endcaps-1-n.tga

View File

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-1875-endcaps-1.tga

View File

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/Payload/restock-service-bay-1-e.tga Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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