Merge branch '2019.3/marc' into mikesbranch

5 年前 · 6957e6b1
--- a/Assets/scenes/main_menu.unity
+++ b/Assets/scenes/main_menu.unity
--- a/Assets/Objects/Testing.meta
+++ b/Assets/Objects/Testing.meta
+fileFormatVersion: 2
+guid: 6f54020f0145c4845839b33164b38e91
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Objects/boats/_BoatBase
+++ b/Assets/Objects/boats/_BoatBase
--- a/Assets/Objects/boats/_BoatBase
+++ b/Assets/Objects/boats/_BoatBase
+fileFormatVersion: 2
+guid: 0d47cf11bf103e245ac3db124552450d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ProBuilder
+++ b/Assets/ProBuilder
+fileFormatVersion: 2
+guid: e568fa194e7613044af48b661cf043b1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: