From 3fcd6e19696e93e80054866e3f1b9ea4ce7c2299 Mon Sep 17 00:00:00 2001
From: chrisgregan <chrisgregan@gmail.com>
Date: Wed, 20 Aug 2014 15:46:02 +0100
Subject: [PATCH] Added summary for Wait command

---
 Assets/Fungus/Camera/Commands/FadeToView.cs |   2 +-
 Assets/Fungus/Camera/Commands/MoveToView.cs |   2 +-
 Assets/Fungus/FungusScript/Commands/Wait.cs |   7 ++++++-
 Assets/Shuttle/ShuttleGame.unity            | Bin 87580 -> 89228 bytes
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Assets/Fungus/Camera/Commands/FadeToView.cs b/Assets/Fungus/Camera/Commands/FadeToView.cs
index 007a02b2..5e62899a 100644
--- a/Assets/Fungus/Camera/Commands/FadeToView.cs
+++ b/Assets/Fungus/Camera/Commands/FadeToView.cs
@@ -60,7 +60,7 @@ namespace Fungus.Script
 			}
 			else
 			{
-				return "Fade to " + targetView.name;
+				return targetView.name;
 			}
 		}
 	}
diff --git a/Assets/Fungus/Camera/Commands/MoveToView.cs b/Assets/Fungus/Camera/Commands/MoveToView.cs
index cd162d91..97dbb3d1 100644
--- a/Assets/Fungus/Camera/Commands/MoveToView.cs
+++ b/Assets/Fungus/Camera/Commands/MoveToView.cs
@@ -47,7 +47,7 @@ namespace Fungus.Script
 			}
 			else
 			{
-				return "Move to " + targetView.name;
+				return targetView.name;
 			}
 		}
 	}
diff --git a/Assets/Fungus/FungusScript/Commands/Wait.cs b/Assets/Fungus/FungusScript/Commands/Wait.cs
index 2894cf6a..abb29b8e 100644
--- a/Assets/Fungus/FungusScript/Commands/Wait.cs
+++ b/Assets/Fungus/FungusScript/Commands/Wait.cs
@@ -7,7 +7,7 @@ namespace Fungus.Script
 	[HelpText("Waits for period of time before executing the next command in the sequence.")]
 	public class Wait : FungusCommand 
 	{
-		public float duration;
+		public float duration = 1;
 
 		public override void OnEnter()
 		{
@@ -18,6 +18,11 @@ namespace Fungus.Script
 		{
 			Continue();
 		}
+
+		public override string GetSummary()
+		{
+			return duration.ToString() + " seconds";
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity
index bb52109a2d75d0ce0420bb9cf7e54b0828602b2e..0d11c0f0252d97550af34b87e0eb54d0926e6f82 100644
GIT binary patch
delta 1410
zcmZA0T}V?=00;1MoMT#P3kt+SGL=MWT59>AxN^yqvd!}QV^c9Kr_2x)3GXNbp+&1<
zSHYM*Xc7j>B#jW(lfET{CA~DJrB<R?fl;>pcOQA~eYou0AOCay=bqg=I4-xolqV1>
z8zHpHN(c$Z*o9w`uF6oIxqh1b^?JR>aKCMzO-`D;QmS|upX_{k_mSLQA92z-s_=T~
zYv<^f%6;4bQZ#URVpl6HIfS&~eg`Yu!tXL{2X+l(VO7CaU^=zmLUAu#pI~FKDvW;w
za-U&g=l!|g0b7L`VLIf#d%c`*!FAvSuoL(v5UepoRwiB`L=OvY&;YZ*gv|tt@5Rhj
zE=h7$SZb~~*WYC}^upNn2D&)2!7T~C3%_H?)QE%cVKx|B?40^(Sd-+YVCswFTyu}d
z*bifiTVPv4j$@vLE|OYp9wDX>Le^#et9-Mtc1A0nTme(&i%Yag#dVD^wj>|slH{TX
z`|6?!_HvwXv`2wvAp3L;1-ANmSQxXJxsP*=3zzmL3v=gTiI>H5PnElyEHHL6D%g@F
z=g<ywrqn`la7a6B>V>hJ(K`y7-I81pEc1#u_hur?Y=g1I3$Qgwt~#Q_ti~ItCpiD$
z%T)vH2eQT8F_EoXzTjStgK5#g=5DO1TZdphIFaCbH(`lI;#?EV0=tcz??o5>e-n^g
z^?!ETfw#XI)+w<T*cMDE4t|QUE0e8SKs8f*0yYL?Hy8&a#e^7<Lxu0F>l@E#=Zrx1
zxE=#%VC-b;qN80|BF^21HNx0jWWrLrOOiVXiz*f84sVupm|^J6`+r<Vfb){zx97{<
z$IHaU8?a6oTdZ<E`}I|(Ow)hxyeiY!ZP6ib8=mB@*dOesIbFM&vvmKoJe@kisDdBK
zqH%PUpUtB6{8kDL<&Bv%il4})2c|XI)J^#|9gXLeGOD0CFLG$xA*$jxbo3lQuA^$I
Jn#MRq{tvR-G)Vve

delta 1377
zcmZA0T}V@59LMqJX|rb7GD;X3qAfv$iAt74(3(nfluk=GHQlrqR&FvwR3bbg2vQ1z
zv|}J_)~&&0#_Z0EV7sajSl&cKEhiNQ8Vq__zcXEXo^x^7IUl~y`9C|HGyW=LW-g<U
zkUt`!%_j&UnK<|3mz*xCC@H^PM*b!eiCkQ7Kb|csp0BqYpgYo8U_<jp5%6eV)4-*p
zhL3b9@bE|5L16+V-8)tbHd@^m2<gLh9Cx{g-!)hab`9s!oh4g`>Giv&#I<yMhE2n+
z<9uhY`vQx@q_w~HY!ha_NXQ`UcOoGqZ`ff|w}pWXz|>}JuzUkQ<WXLzZ4kzG<FJUV
zo4)V16;<)wQ`j&}+DvNG?=yuF+lnmwkU3&2t>(kP!cW^6j2*lHi^@9J=&HT4hVOb{
z9vC~AE|bm}%qi?6WK*$wv~1ONT8;eTR+t~gE;bf7b*XCkt`=s8vEA{Rsjfv?mkY}_
zr8_}-6t_&C8xEj~*-YqD$l<=s4++D<Fm{NpCEA^Th3`sWgD|%98fTpmS?4p(3eKWB
zK5X!sT*EN-Q8&U?WZhf;d3R|&-$h_!Fm`bJp#gVP)^)%t%~B_%UxuMPb*~4=4i;ds
zWSH*m#Pq#-M5D~hdKVUkv4gu|`Hh4;K!-Oy`Jy{vK3E@YTQbZiE}-TrgRmZ$2PWMx
z_1P7y&-cb)?Xc8WauQ}l#17WNd;mK-%t#KNnyct1P5hsG0u!u2cJcVKx8E-dCt#{(
zzEc;j^xI+V(>e@Wly%3png_Bie3t`rz%aM`|F`(<#oEx4Ec_1BSoy)az_Y|xh4@@S
zb-{NEYB)oc!JKo{tD^hGmj<d8*A3Jv#?DfW7^$LJ!JAbyN`sR%)O<v&uA!$ydj?gC
QSr%&MFSCP_78+On13+FRp8x;=