From e458628faa2e3ab920b2537434562c28f1baaabe Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 8 Aug 2014 16:13:17 +0100 Subject: [PATCH] Set operators now match c# equivalents --- .../Fungus/Editor/FungusScript/SetEditor.cs | 8 ++++---- Assets/Fungus/VisualScripting/Set.cs | 8 ++++---- Assets/Shuttle/ShuttleGame.unity | Bin 80644 -> 80644 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Fungus/Editor/FungusScript/SetEditor.cs b/Assets/Fungus/Editor/FungusScript/SetEditor.cs index 91be314f..eb348bb4 100644 --- a/Assets/Fungus/Editor/FungusScript/SetEditor.cs +++ b/Assets/Fungus/Editor/FungusScript/SetEditor.cs @@ -45,10 +45,10 @@ namespace Fungus.Script else if (variable.GetType() == typeof(IntegerVariable) || variable.GetType() == typeof(FloatVariable)) { - operatorsList.Add(new GUIContent("+")); - operatorsList.Add(new GUIContent("-")); - operatorsList.Add(new GUIContent("*")); - operatorsList.Add(new GUIContent("/")); + operatorsList.Add(new GUIContent("+=")); + operatorsList.Add(new GUIContent("-=")); + operatorsList.Add(new GUIContent("*=")); + operatorsList.Add(new GUIContent("/=")); } int selectedIndex = 0; diff --git a/Assets/Fungus/VisualScripting/Set.cs b/Assets/Fungus/VisualScripting/Set.cs index ccd20b92..d93fbfc4 100644 --- a/Assets/Fungus/VisualScripting/Set.cs +++ b/Assets/Fungus/VisualScripting/Set.cs @@ -10,10 +10,10 @@ namespace Fungus.Script { Assign, // = Negate, // ! - Add, // + - Subtract, // - - Multiply, // * - Divide // / + Add, // += + Subtract, // -= + Multiply, // *= + Divide // /= } public FungusVariable variable; diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index d7bf817757fb48ba17f832f8bf8b6cf59bbe2d79..1769ed8c6a2ac9aaf59f35b0abf44386025b50da 100644 GIT binary patch delta 105 zcmZqq#?tbQrC|%>6zSf6QmdoraLe*@@yB8VSK^EqEQhNF!cbV#B?5ZMy~0% z7#a1p2WT>yFtUOqSSB0(7G~6#evp~bdOAoLEXp)Jk)2U`x&S*P+hnWXa@zy68Mp8Q E0A?N?ga7~l delta 85 zcmZqq#?tbQrC|%>6zS;~m>G4ZZ;)d2nC`&L$g^EUhVcati&jNQz|;eb8q*&zGHPrO o&}1}WWK^4ekeShXvcqqQ=^z1Cb)Xui=@%Ip?Y9SLGj8Dr0KH!th5!Hn