Merge branch 'master' of https://bitbucket.org/JoshuaReason/irontoad

8 years ago · 6bc407df6f
--- a/IronToad_UnityProject/Assets/Prefabs/M_Boat.prefab
+++ b/IronToad_UnityProject/Assets/Prefabs/M_Boat.prefab
--- a/IronToad_UnityProject/Assets/Prefabs/M_Boat.prefab.meta
+++ b/IronToad_UnityProject/Assets/Prefabs/M_Boat.prefab.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 49ba957b81ad93f4b8e04c2108f18658
 timeCreated: 1485008035
 licenseType: Free
 NativeFormatImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
+++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
--- a/IronToad_UnityProject/Assets/water/Water.mat
+++ b/IronToad_UnityProject/Assets/water/Water.mat
--- a/IronToad_UnityProject/Assets/water/planeWater.prefab
+++ b/IronToad_UnityProject/Assets/water/planeWater.prefab