Merge branch 'master' into probes

Browse Source

...

This commit is contained in:

Chris Adderley 2019-01-13 23:39:09 -08:00

parent 3d14e3c00e 6760c4a3e1

commit a5a3e9dd3f

187 changed files with 3762 additions and 975 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

Assets/CineboxAndrew/Communication/restock-antenna-5-n.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-antenna-5-s.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-antenna-5.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-antennas-1.blend Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-relays-1-n.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-relays-1-s.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-relays-1.blend Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Communication/restock-relays-1.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-GCMS-1-n.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-GCMS-1-s.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-GCMS-1.blend Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-GCMS-1.psd Normal file

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-instruments.psd

View File

Binary file not shown.

BIN

Assets/CineboxAndrew/Science/restock-science-1.psd

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-1-alt-b.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-2-b.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heat-shield-3-b.tga

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-endcap-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-e.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-grey.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-crewed-hatch-1.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-b.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-n.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1-s.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-endcap-crewed-1.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-hitchhiker-1.tga

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-lab-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-e.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod-1.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-3-pod.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-e.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander-1.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk1-lander.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-e.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.tga Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk3-1-pod.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5-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/Communication/restock-antenna-5.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/Communication/restock-antenna-radial-5.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-2.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-1.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-2.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-stack-3.mu Normal file

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-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/Communication/restock-relays-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-docking-125-1.mu

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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.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-boar-1.mu Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

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

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