Merge branch 'development'

allista · Jul 5, 2020 · 052482c · 052482c
2 parents e9e530b + 5fbdead
commit 052482c
Show file tree

Hide file tree

Showing 28 changed files with 2,876 additions and 1,655 deletions.
diff --git a/Assets/Scenes/fairings.unity b/Assets/Scenes/fairings.unity
diff --git a/Assets/Scenes/structural-grapple.unity b/Assets/Scenes/structural-grapple.unity
diff --git a/Assets/Textures/bolt-norm.png.meta b/Assets/Textures/bolt-norm.png.meta
diff --git a/Assets/Textures/box-fairings.png.meta b/Assets/Textures/box-fairings.png.meta
diff --git a/Assets/Textures/conic-projector-emissive.png.meta b/Assets/Textures/conic-projector-emissive.png.meta
diff --git a/Assets/Textures/conic-projector.png.meta b/Assets/Textures/conic-projector.png.meta