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

8 years ago · 9aa76cf59a
--- a/.gitignore
+++ b/.gitignore
@ -39,3 +39,4 @@ IronToad_UnityProject/Library/
 IronToad_UnityProject/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert
 IronToad_UnityProject/Temp/UnityLockfile
 IronToad_UnityProject/Temp/
 IronToad_UnityProject/Build/TestBuild01_Data/
--- a/IronToad_UnityProject/Assets/Animations/WaveRing.controller
+++ b/IronToad_UnityProject/Assets/Animations/WaveRing.controller
--- a/IronToad_UnityProject/Assets/Animations/WaveRingPlay.anim
+++ b/IronToad_UnityProject/Assets/Animations/WaveRingPlay.anim
--- a/IronToad_UnityProject/Assets/Scripts/WaterController.cs
+++ b/IronToad_UnityProject/Assets/Scripts/WaterController.cs
@ -13,7 +13,7 @@ public class WaterController : MonoBehaviour {
    public float waveSpeed = 1;
    public float maxWaveHeight = 2;
    private readonly float scaleConstant = 50f;
    private readonly float scaleConstant = 75f;
    public GameObject rippleEffect;
--- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
+++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
--- a/IronToad_UnityProject/Assets/water/WaterWave.mat
+++ b/IronToad_UnityProject/Assets/water/WaterWave.mat
--- a/IronToad_UnityProject/ProjectSettings/EditorBuildSettings.asset
+++ b/IronToad_UnityProject/ProjectSettings/EditorBuildSettings.asset