Merge branch 'development'

allista · Jul 30, 2020 · 23dbb42 · 23dbb42
2 parents 35c0b0d + fd0649a
commit 23dbb42
Show file tree

Hide file tree

Showing 127 changed files with 9,949 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 *~
 *.swp
 *.mdb
-*.meta
 *.blend1
+*.blend1.meta
 
 bin
 obj

diff --git a/Assets/Animations.meta b/Assets/Animations.meta
diff --git a/Assets/Animations/IndicatorLightAction.anim.meta b/Assets/Animations/IndicatorLightAction.anim.meta
diff --git a/Assets/Animations/MobileWorkshop-lights.anim.meta b/Assets/Animations/MobileWorkshop-lights.anim.meta
diff --git a/Assets/Animations/MobileWorkshop-windows.anim.meta b/Assets/Animations/MobileWorkshop-windows.anim.meta
diff --git a/Assets/Animations/SpaceCrane-lights-emission.anim.meta b/Assets/Animations/SpaceCrane-lights-emission.anim.meta
diff --git a/Assets/Animations/SpaceCrane-lights-orig.anim.meta b/Assets/Animations/SpaceCrane-lights-orig.anim.meta
diff --git a/Assets/Animations/SpaceCrane-lights.anim.meta b/Assets/Animations/SpaceCrane-lights.anim.meta
diff --git a/Assets/Animations/SpotLightAction.anim.meta b/Assets/Animations/SpotLightAction.anim.meta
diff --git a/Assets/DIYKit-SPH.png.meta b/Assets/DIYKit-SPH.png.meta
diff --git a/Assets/DIYKit-UV.png.meta b/Assets/DIYKit-UV.png.meta
diff --git a/Assets/DIYKit-dirt.png.meta b/Assets/DIYKit-dirt.png.meta
diff --git a/Assets/DIYKit-dirt2.png.meta b/Assets/DIYKit-dirt2.png.meta