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

7 years ago · 0b3d2870b4
--- a/IronToad_UnityProject/Assets/Materials/Red.mat
+++ b/IronToad_UnityProject/Assets/Materials/Red.mat
--- a/IronToad_UnityProject/Assets/Materials/Red.mat.meta
+++ b/IronToad_UnityProject/Assets/Materials/Red.mat.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: e3ca8016046ab344891da75bcfe3ef01
 timeCreated: 1484987106
 licenseType: Pro
 NativeFormatImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/IronToad_UnityProject/Assets/Materials/Yellow.mat
+++ b/IronToad_UnityProject/Assets/Materials/Yellow.mat
--- a/IronToad_UnityProject/Assets/Materials/Yellow.mat.meta
+++ b/IronToad_UnityProject/Assets/Materials/Yellow.mat.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 4abaec0eba1d78c4baa5a2992a12d7c9
 timeCreated: 1484987097
 licenseType: Pro
 NativeFormatImporter:
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
+++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity