From fd012188a173f9fac95d0b631983893d02d53c3a Mon Sep 17 00:00:00 2001
From: "ATC522-011\\IGDA" <huyhoang.tran@live.com.au>
Date: Sun, 22 Jan 2017 13:30:44 +1100
Subject: [PATCH] -ignore pushing builds

---
 .gitignore                                    |   1 +
 .../Assets/Animations/WaveRing.controller     | Bin 7032 -> 7032 bytes
 .../Assets/Animations/WaveRingPlay.anim       | Bin 10668 -> 10868 bytes
 .../Assets/Scripts/WaterController.cs         |   2 +-
 .../Assets/_Scenes/GreyBox_Prototype.unity    | Bin 402996 -> 402996 bytes
 .../Assets/water/WaterWave.mat                | Bin 5108 -> 5108 bytes
 .../ProjectSettings/EditorBuildSettings.asset | Bin 4104 -> 4152 bytes
 7 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 09d6665..3d0ca0b 100644
--- 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/
diff --git a/IronToad_UnityProject/Assets/Animations/WaveRing.controller b/IronToad_UnityProject/Assets/Animations/WaveRing.controller
index 6766e28481e9b4ebc10a7e1e3aba3c7072062d1a..f31022f312b7be0f90b3e2532d2a98d958e27caf 100644
GIT binary patch
delta 15
Xcmexi_QPz$94Y2mGbJa_m%0f6Jk$p_

delta 15
Xcmexi_QPz$94Y3rXM85lm%0f6Kxzlj

diff --git a/IronToad_UnityProject/Assets/Animations/WaveRingPlay.anim b/IronToad_UnityProject/Assets/Animations/WaveRingPlay.anim
index 2176cd212c029b6424da9969b978125b326139d0..d30952c3dd9e68516544ac6745c7a013157a87ad 100644
GIT binary patch
delta 329
zcmZ1z{3V2gfkAC21A|t{Mvg6NOiP$2A5_zx{8CMyksZhqo~)y;BlBxXyZyr|5&M>>
z^A3P;2Ll7c*)vn@ffU1JA9V%hvuCzUj#hWIU<HYQ!2yWmLhJpmK>qQ<DfVe;YW9<X
z{JMIPBOoz|0S#dO<N!?($z_qj4vt`nE%w(JPp}8^fm{aG$#>P4vjDBI2RmrC2Iru1
Kn(gEZYHR>b0C7M7

delta 209
zcmewovL={=fkAC21B2$8jT~FlnC>u5KB%TW`K6jZBMXovJXuFwXL5tO$mA93CbrBB
zFmS*g#L8I2dB7D&pFJ}L$ZyyW;)BFlfjHpT6nlHqd3K$#PxgVt949+!EN20Uf{p#J
L!AW%s47HpA$z(fX

diff --git a/IronToad_UnityProject/Assets/Scripts/WaterController.cs b/IronToad_UnityProject/Assets/Scripts/WaterController.cs
index cd1f2d2..b9d9b5b 100644
--- 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;
 
diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
index 97b281b758b4803e3d90916d41a6a5dc34fe0f6e..2831c53d5eedf8ab67aea20c3f33ee417f3b0713 100644
GIT binary patch
delta 43
vcmdmTMq<kuiH0qVOa8DttSYge{;-Epq5Z@kMj&PaVrC#_*?!^=YmO!W@1GWk

delta 43
vcmdmTMq<kuiH0qVOa8EEx0l&Zf7rvQ(0<|%BM>tIF*6XeY(MdbHAfQw+f^0e

diff --git a/IronToad_UnityProject/Assets/water/WaterWave.mat b/IronToad_UnityProject/Assets/water/WaterWave.mat
index 97e7cb5f9fba858ac6b452275173dace35c5b981..12346be909674bdf5d6af1c717d1e8f7501c867c 100644
GIT binary patch
delta 17
YcmeyO{zZMm8X*=2h6Jb08-!dK0YEzj1poj5

delta 17
YcmeyO{zZMm8X*>A<6_6n8-!dK0Yn`JeE<Le

diff --git a/IronToad_UnityProject/ProjectSettings/EditorBuildSettings.asset b/IronToad_UnityProject/ProjectSettings/EditorBuildSettings.asset
index cb509c7531ee38c970dc8085cde19a17ea5cead7..6b5092267b4aa1183e72384300211efb842bee09 100644
GIT binary patch
delta 77
zcmeBB*rC9|z`)qaz#w3;k)wr?(PHyN#&SLrMh2iL5UT;PV{vh6NwI!>aB^y1YO%h1
cQEH`AenoshQGQ8&No7H*UTI!tNhJdV0Jq!}<p2Nx

delta 28
jcmdm?(4oM=z`)qaz#zb}k)wr?kz?~j#$vw73m7>7S(gTM