From 95a5f79b9c3f2ababc80c56bda04615a065bbca9 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 10 Sep 2014 17:41:43 +0100 Subject: [PATCH] Renamed Fungus.Script namespace to Fungus --- Assets/Example/Scenes/Example.unity | Bin 128372 -> 128372 bytes .../Fungus/Animation/Commands/SetAnimBool.cs | 2 +- .../Fungus/Animation/Commands/SetAnimFloat.cs | 2 +- .../Animation/Commands/SetAnimInteger.cs | 2 +- .../Animation/Commands/SetAnimTrigger.cs | 2 +- Assets/Fungus/Audio/Commands/PlayMusic.cs | 2 +- Assets/Fungus/Audio/Commands/PlaySound.cs | 2 +- .../Fungus/Audio/Commands/SetMusicVolume.cs | 2 +- Assets/Fungus/Audio/Commands/StopMusic.cs | 2 +- Assets/Fungus/Camera/Commands/FadeToView.cs | 2 +- Assets/Fungus/Camera/Commands/MoveToView.cs | 2 +- Assets/Fungus/Camera/Commands/ShakeCamera.cs | 2 +- Assets/Fungus/Dialog/Commands/AddOption.cs | 2 +- Assets/Fungus/Dialog/Commands/Choose.cs | 2 +- Assets/Fungus/Dialog/Commands/Say.cs | 2 +- .../Fungus/Dialog/Commands/SetChooseDialog.cs | 2 +- Assets/Fungus/Dialog/Commands/SetSayDialog.cs | 2 +- .../Fungus/Dialog/Editor/AddOptionEditor.cs | 2 +- .../Fungus/Dialog/Editor/CharacterEditor.cs | 2 +- Assets/Fungus/Dialog/Editor/ChooseEditor.cs | 2 +- Assets/Fungus/Dialog/Editor/SayEditor.cs | 2 +- .../Dialog/Editor/SetChooseDialogEditor.cs | 2 +- .../Dialog/Editor/SetSayDialogEditor.cs | 2 +- Assets/Fungus/Dialog/Scripts/Character.cs | 2 +- Assets/Fungus/Dialog/Scripts/ChooseDialog.cs | 2 +- Assets/Fungus/Dialog/Scripts/Dialog.cs | 2 +- Assets/Fungus/Dialog/Scripts/SayDialog.cs | 2 +- Assets/Fungus/FungusScript/Commands/Call.cs | 2 +- Assets/Fungus/FungusScript/Commands/Else.cs | 2 +- Assets/Fungus/FungusScript/Commands/EndIf.cs | 2 +- Assets/Fungus/FungusScript/Commands/If.cs | 2 +- .../FungusScript/Commands/LoadGlobals.cs | 2 +- .../Fungus/FungusScript/Commands/LoadScene.cs | 2 +- .../FungusScript/Commands/SaveGlobals.cs | 2 +- .../FungusScript/Commands/SetVariable.cs | 2 +- Assets/Fungus/FungusScript/Commands/Wait.cs | 2 +- .../Fungus/FungusScript/Editor/CallEditor.cs | 2 +- .../FungusScript/Editor/CommandEditor.cs | 2 +- .../FungusScript/Editor/CommandListAdaptor.cs | 2 +- .../FungusScript/Editor/FungusScriptEditor.cs | 2 +- .../FungusScript/Editor/FungusScriptWindow.cs | 2 +- Assets/Fungus/FungusScript/Editor/IfEditor.cs | 2 +- .../FungusScript/Editor/SequenceEditor.cs | 2 +- .../FungusScript/Editor/SetVariableEditor.cs | 2 +- .../FungusScript/Editor/VariableEditor.cs | 2 +- .../Editor/VariableListAdaptor.cs | 2 +- .../FungusScript/Scripts/BooleanVariable.cs | 2 +- Assets/Fungus/FungusScript/Scripts/Command.cs | 2 +- .../FungusScript/Scripts/FloatVariable.cs | 2 +- .../FungusScript/Scripts/FungusScript.cs | 2 +- .../FungusScript/Scripts/GlobalVariables.cs | 2 +- .../FungusScript/Scripts/IntegerVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/Sequence.cs | 2 +- .../FungusScript/Scripts/StringVariable.cs | 2 +- .../FungusScript/Scripts/StringsParser.cs | 2 +- .../Fungus/FungusScript/Scripts/Variable.cs | 2 +- Assets/Fungus/Sprite/Commands/FadeSprite.cs | 2 +- Assets/Fungus/Sprite/Commands/ShowSprite.cs | 2 +- 58 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity index 5c0a698c5c0b4e8248171571824d608afa1821d3..ba0a0795501997abb6542d4fa3b7ee2d8d63e3f5 100644 GIT binary patch delta 38 scmezJiv7zg_J%Ete1{niZ0A4B7^uoK<%Fj@0}#vt(%W-hFmmt$07N7Xod5s; delta 38 rcmezJiv7zg_J%Ete1{nuw(}om3{>T*J8+|x0SKCa^!A(=j2yfGOk@wK diff --git a/Assets/Fungus/Animation/Commands/SetAnimBool.cs b/Assets/Fungus/Animation/Commands/SetAnimBool.cs index 784df074..00f5dc54 100644 --- a/Assets/Fungus/Animation/Commands/SetAnimBool.cs +++ b/Assets/Fungus/Animation/Commands/SetAnimBool.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Animation", "Set Anim Bool", diff --git a/Assets/Fungus/Animation/Commands/SetAnimFloat.cs b/Assets/Fungus/Animation/Commands/SetAnimFloat.cs index e8b7b2f0..289728fe 100644 --- a/Assets/Fungus/Animation/Commands/SetAnimFloat.cs +++ b/Assets/Fungus/Animation/Commands/SetAnimFloat.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Animation", "Set Anim Float", diff --git a/Assets/Fungus/Animation/Commands/SetAnimInteger.cs b/Assets/Fungus/Animation/Commands/SetAnimInteger.cs index b9ea9e0e..ec82adf8 100644 --- a/Assets/Fungus/Animation/Commands/SetAnimInteger.cs +++ b/Assets/Fungus/Animation/Commands/SetAnimInteger.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Animation", "Set Anim Integer", diff --git a/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs b/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs index aef34e82..58c724ab 100644 --- a/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs +++ b/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Animation", "Set Anim Trigger", diff --git a/Assets/Fungus/Audio/Commands/PlayMusic.cs b/Assets/Fungus/Audio/Commands/PlayMusic.cs index 1aaa662e..e8e6be14 100644 --- a/Assets/Fungus/Audio/Commands/PlayMusic.cs +++ b/Assets/Fungus/Audio/Commands/PlayMusic.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Audio", "Play Music", diff --git a/Assets/Fungus/Audio/Commands/PlaySound.cs b/Assets/Fungus/Audio/Commands/PlaySound.cs index 37fb9e99..45eb5fe1 100644 --- a/Assets/Fungus/Audio/Commands/PlaySound.cs +++ b/Assets/Fungus/Audio/Commands/PlaySound.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Audio", "Play Sound", diff --git a/Assets/Fungus/Audio/Commands/SetMusicVolume.cs b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs index ac06f854..a5abf57f 100644 --- a/Assets/Fungus/Audio/Commands/SetMusicVolume.cs +++ b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Audio", "Set Music Volume", diff --git a/Assets/Fungus/Audio/Commands/StopMusic.cs b/Assets/Fungus/Audio/Commands/StopMusic.cs index 1703770a..2029d256 100644 --- a/Assets/Fungus/Audio/Commands/StopMusic.cs +++ b/Assets/Fungus/Audio/Commands/StopMusic.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Audio", "Stop Music", diff --git a/Assets/Fungus/Camera/Commands/FadeToView.cs b/Assets/Fungus/Camera/Commands/FadeToView.cs index 4d3d32e7..2db9d27e 100644 --- a/Assets/Fungus/Camera/Commands/FadeToView.cs +++ b/Assets/Fungus/Camera/Commands/FadeToView.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Camera", "Fade To View", diff --git a/Assets/Fungus/Camera/Commands/MoveToView.cs b/Assets/Fungus/Camera/Commands/MoveToView.cs index 953ff950..65e7dfd8 100644 --- a/Assets/Fungus/Camera/Commands/MoveToView.cs +++ b/Assets/Fungus/Camera/Commands/MoveToView.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Camera", "Move To View", diff --git a/Assets/Fungus/Camera/Commands/ShakeCamera.cs b/Assets/Fungus/Camera/Commands/ShakeCamera.cs index 7dda535e..c3a89feb 100644 --- a/Assets/Fungus/Camera/Commands/ShakeCamera.cs +++ b/Assets/Fungus/Camera/Commands/ShakeCamera.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Camera", "Shake Camera", diff --git a/Assets/Fungus/Dialog/Commands/AddOption.cs b/Assets/Fungus/Dialog/Commands/AddOption.cs index 3771e3e5..a6432a89 100644 --- a/Assets/Fungus/Dialog/Commands/AddOption.cs +++ b/Assets/Fungus/Dialog/Commands/AddOption.cs @@ -3,7 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Dialog", "Add Option", diff --git a/Assets/Fungus/Dialog/Commands/Choose.cs b/Assets/Fungus/Dialog/Commands/Choose.cs index 2f900337..16723fef 100644 --- a/Assets/Fungus/Dialog/Commands/Choose.cs +++ b/Assets/Fungus/Dialog/Commands/Choose.cs @@ -3,7 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Dialog", "Choose", diff --git a/Assets/Fungus/Dialog/Commands/Say.cs b/Assets/Fungus/Dialog/Commands/Say.cs index 4c0ffa0b..3e7a0ab2 100644 --- a/Assets/Fungus/Dialog/Commands/Say.cs +++ b/Assets/Fungus/Dialog/Commands/Say.cs @@ -3,7 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Dialog", "Say", diff --git a/Assets/Fungus/Dialog/Commands/SetChooseDialog.cs b/Assets/Fungus/Dialog/Commands/SetChooseDialog.cs index 0dfd2e23..b5240576 100644 --- a/Assets/Fungus/Dialog/Commands/SetChooseDialog.cs +++ b/Assets/Fungus/Dialog/Commands/SetChooseDialog.cs @@ -3,7 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Dialog", "Set Choose Dialog", diff --git a/Assets/Fungus/Dialog/Commands/SetSayDialog.cs b/Assets/Fungus/Dialog/Commands/SetSayDialog.cs index cf4bf385..21523a3d 100644 --- a/Assets/Fungus/Dialog/Commands/SetSayDialog.cs +++ b/Assets/Fungus/Dialog/Commands/SetSayDialog.cs @@ -3,7 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Dialog", "Set Say Dialog", diff --git a/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs b/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs index 421fa45c..1d853784 100644 --- a/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs +++ b/Assets/Fungus/Dialog/Editor/AddOptionEditor.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(AddOption))] diff --git a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs index d1af0f61..f9d5f5a8 100644 --- a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs +++ b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Character))] diff --git a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs b/Assets/Fungus/Dialog/Editor/ChooseEditor.cs index 081a22e1..af131492 100644 --- a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs +++ b/Assets/Fungus/Dialog/Editor/ChooseEditor.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Choose))] diff --git a/Assets/Fungus/Dialog/Editor/SayEditor.cs b/Assets/Fungus/Dialog/Editor/SayEditor.cs index 931195e0..8aa7e818 100644 --- a/Assets/Fungus/Dialog/Editor/SayEditor.cs +++ b/Assets/Fungus/Dialog/Editor/SayEditor.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Say))] diff --git a/Assets/Fungus/Dialog/Editor/SetChooseDialogEditor.cs b/Assets/Fungus/Dialog/Editor/SetChooseDialogEditor.cs index a323f928..f79054ed 100644 --- a/Assets/Fungus/Dialog/Editor/SetChooseDialogEditor.cs +++ b/Assets/Fungus/Dialog/Editor/SetChooseDialogEditor.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(SetChooseDialog))] diff --git a/Assets/Fungus/Dialog/Editor/SetSayDialogEditor.cs b/Assets/Fungus/Dialog/Editor/SetSayDialogEditor.cs index d682fd8e..0721f03b 100644 --- a/Assets/Fungus/Dialog/Editor/SetSayDialogEditor.cs +++ b/Assets/Fungus/Dialog/Editor/SetSayDialogEditor.cs @@ -5,7 +5,7 @@ using System.Collections; using System.Collections.Generic; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(SetSayDialog))] diff --git a/Assets/Fungus/Dialog/Scripts/Character.cs b/Assets/Fungus/Dialog/Scripts/Character.cs index 9f854ac6..67321e2a 100644 --- a/Assets/Fungus/Dialog/Scripts/Character.cs +++ b/Assets/Fungus/Dialog/Scripts/Character.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [ExecuteInEditMode] diff --git a/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs b/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs index 57bd93eb..caf46ac6 100644 --- a/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs +++ b/Assets/Fungus/Dialog/Scripts/ChooseDialog.cs @@ -5,7 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [ExecuteInEditMode] diff --git a/Assets/Fungus/Dialog/Scripts/Dialog.cs b/Assets/Fungus/Dialog/Scripts/Dialog.cs index 4d5b1578..3dcc4f8e 100644 --- a/Assets/Fungus/Dialog/Scripts/Dialog.cs +++ b/Assets/Fungus/Dialog/Scripts/Dialog.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Text.RegularExpressions; -namespace Fungus.Script +namespace Fungus { public class Dialog : MonoBehaviour diff --git a/Assets/Fungus/Dialog/Scripts/SayDialog.cs b/Assets/Fungus/Dialog/Scripts/SayDialog.cs index 7952dd9b..ede8528a 100644 --- a/Assets/Fungus/Dialog/Scripts/SayDialog.cs +++ b/Assets/Fungus/Dialog/Scripts/SayDialog.cs @@ -4,7 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [ExecuteInEditMode] diff --git a/Assets/Fungus/FungusScript/Commands/Call.cs b/Assets/Fungus/FungusScript/Commands/Call.cs index 5cb4c30c..0bbf6e5b 100644 --- a/Assets/Fungus/FungusScript/Commands/Call.cs +++ b/Assets/Fungus/FungusScript/Commands/Call.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Call", diff --git a/Assets/Fungus/FungusScript/Commands/Else.cs b/Assets/Fungus/FungusScript/Commands/Else.cs index 052e141e..aaafc604 100644 --- a/Assets/Fungus/FungusScript/Commands/Else.cs +++ b/Assets/Fungus/FungusScript/Commands/Else.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Else", diff --git a/Assets/Fungus/FungusScript/Commands/EndIf.cs b/Assets/Fungus/FungusScript/Commands/EndIf.cs index e33c9f40..31da0345 100644 --- a/Assets/Fungus/FungusScript/Commands/EndIf.cs +++ b/Assets/Fungus/FungusScript/Commands/EndIf.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "End If", diff --git a/Assets/Fungus/FungusScript/Commands/If.cs b/Assets/Fungus/FungusScript/Commands/If.cs index d3d5d2a5..ba1151dd 100644 --- a/Assets/Fungus/FungusScript/Commands/If.cs +++ b/Assets/Fungus/FungusScript/Commands/If.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { public enum CompareOperator { diff --git a/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs b/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs index d953824c..8d36ba22 100644 --- a/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs +++ b/Assets/Fungus/FungusScript/Commands/LoadGlobals.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Load Globals", diff --git a/Assets/Fungus/FungusScript/Commands/LoadScene.cs b/Assets/Fungus/FungusScript/Commands/LoadScene.cs index e7b51eac..9865334b 100644 --- a/Assets/Fungus/FungusScript/Commands/LoadScene.cs +++ b/Assets/Fungus/FungusScript/Commands/LoadScene.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Load Scene", diff --git a/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs b/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs index 81cf4716..81e33cf1 100644 --- a/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs +++ b/Assets/Fungus/FungusScript/Commands/SaveGlobals.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Save Globals", diff --git a/Assets/Fungus/FungusScript/Commands/SetVariable.cs b/Assets/Fungus/FungusScript/Commands/SetVariable.cs index bef66593..025e02df 100644 --- a/Assets/Fungus/FungusScript/Commands/SetVariable.cs +++ b/Assets/Fungus/FungusScript/Commands/SetVariable.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Set Variable", diff --git a/Assets/Fungus/FungusScript/Commands/Wait.cs b/Assets/Fungus/FungusScript/Commands/Wait.cs index 79ed4f08..a685d624 100644 --- a/Assets/Fungus/FungusScript/Commands/Wait.cs +++ b/Assets/Fungus/FungusScript/Commands/Wait.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Scripting", "Wait", diff --git a/Assets/Fungus/FungusScript/Editor/CallEditor.cs b/Assets/Fungus/FungusScript/Editor/CallEditor.cs index 6e957342..a10089c9 100644 --- a/Assets/Fungus/FungusScript/Editor/CallEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/CallEditor.cs @@ -3,7 +3,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Call))] public class CallEditor : CommandEditor diff --git a/Assets/Fungus/FungusScript/Editor/CommandEditor.cs b/Assets/Fungus/FungusScript/Editor/CommandEditor.cs index a7f007f0..0da5a504 100644 --- a/Assets/Fungus/FungusScript/Editor/CommandEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/CommandEditor.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Command), true)] diff --git a/Assets/Fungus/FungusScript/Editor/CommandListAdaptor.cs b/Assets/Fungus/FungusScript/Editor/CommandListAdaptor.cs index 879cd7de..130f4cbe 100644 --- a/Assets/Fungus/FungusScript/Editor/CommandListAdaptor.cs +++ b/Assets/Fungus/FungusScript/Editor/CommandListAdaptor.cs @@ -7,7 +7,7 @@ using UnityEditor; using System; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { public class CommandListAdaptor : IReorderableListAdaptor { diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs index 9c7491d3..29650483 100644 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Rotorz.ReorderableList; using System.Linq; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(FungusScript))] public class FungusScriptEditor : Editor diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs index 18bf8691..21211d3e 100755 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs @@ -4,7 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { public class FungusScriptWindow : EditorWindow { diff --git a/Assets/Fungus/FungusScript/Editor/IfEditor.cs b/Assets/Fungus/FungusScript/Editor/IfEditor.cs index e8003fd3..d31f397e 100644 --- a/Assets/Fungus/FungusScript/Editor/IfEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/IfEditor.cs @@ -3,7 +3,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(If))] diff --git a/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs index e1a500a6..e69295b0 100644 --- a/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Sequence))] diff --git a/Assets/Fungus/FungusScript/Editor/SetVariableEditor.cs b/Assets/Fungus/FungusScript/Editor/SetVariableEditor.cs index 95de234b..f42b0f92 100644 --- a/Assets/Fungus/FungusScript/Editor/SetVariableEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/SetVariableEditor.cs @@ -3,7 +3,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(SetVariable))] diff --git a/Assets/Fungus/FungusScript/Editor/VariableEditor.cs b/Assets/Fungus/FungusScript/Editor/VariableEditor.cs index d15ca17d..cd1786d4 100644 --- a/Assets/Fungus/FungusScript/Editor/VariableEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/VariableEditor.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -namespace Fungus.Script +namespace Fungus { [CustomEditor (typeof(Variable), true)] public class VariableEditor : CommandEditor diff --git a/Assets/Fungus/FungusScript/Editor/VariableListAdaptor.cs b/Assets/Fungus/FungusScript/Editor/VariableListAdaptor.cs index 965cd13c..13f7566c 100644 --- a/Assets/Fungus/FungusScript/Editor/VariableListAdaptor.cs +++ b/Assets/Fungus/FungusScript/Editor/VariableListAdaptor.cs @@ -7,7 +7,7 @@ using UnityEditor; using System; using Rotorz.ReorderableList; -namespace Fungus.Script +namespace Fungus { public class VariableListAdaptor : IReorderableListAdaptor { diff --git a/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs b/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs index 858cc9c5..9b567e61 100644 --- a/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { public class BooleanVariable : Variable diff --git a/Assets/Fungus/FungusScript/Scripts/Command.cs b/Assets/Fungus/FungusScript/Scripts/Command.cs index 2d352d16..70210d96 100644 --- a/Assets/Fungus/FungusScript/Scripts/Command.cs +++ b/Assets/Fungus/FungusScript/Scripts/Command.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { public class CommandInfoAttribute : Attribute diff --git a/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs b/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs index 3ec8fd72..47b9f74f 100644 --- a/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { public class FloatVariable : Variable diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs index ffb29814..079425c7 100644 --- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs +++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { public class FungusScript : MonoBehaviour diff --git a/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs b/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs index 9334d88d..e9af853b 100644 --- a/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs +++ b/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs @@ -6,7 +6,7 @@ using System.Text.RegularExpressions; using System.Runtime.Serialization.Formatters.Binary; using System.IO; -namespace Fungus.Script +namespace Fungus { /** * Static data storage class for managing global game variables. diff --git a/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs b/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs index ccc9c299..c6f05f31 100644 --- a/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { public class IntegerVariable : Variable diff --git a/Assets/Fungus/FungusScript/Scripts/Sequence.cs b/Assets/Fungus/FungusScript/Scripts/Sequence.cs index 5bed2e2a..e4ee5700 100644 --- a/Assets/Fungus/FungusScript/Scripts/Sequence.cs +++ b/Assets/Fungus/FungusScript/Scripts/Sequence.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.Script +namespace Fungus { [ExecuteInEditMode] diff --git a/Assets/Fungus/FungusScript/Scripts/StringVariable.cs b/Assets/Fungus/FungusScript/Scripts/StringVariable.cs index 7b21bab0..fd834a94 100644 --- a/Assets/Fungus/FungusScript/Scripts/StringVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/StringVariable.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Script +namespace Fungus { public class StringVariable : Variable diff --git a/Assets/Fungus/FungusScript/Scripts/StringsParser.cs b/Assets/Fungus/FungusScript/Scripts/StringsParser.cs index 15041c0c..b63c2c4e 100644 --- a/Assets/Fungus/FungusScript/Scripts/StringsParser.cs +++ b/Assets/Fungus/FungusScript/Scripts/StringsParser.cs @@ -2,7 +2,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; using System.Text.RegularExpressions; -using Fungus.Script; +using Fungus; namespace Fungus { diff --git a/Assets/Fungus/FungusScript/Scripts/Variable.cs b/Assets/Fungus/FungusScript/Scripts/Variable.cs index 6e21e438..de5e70bf 100644 --- a/Assets/Fungus/FungusScript/Scripts/Variable.cs +++ b/Assets/Fungus/FungusScript/Scripts/Variable.cs @@ -2,7 +2,7 @@ using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { public enum VariableType { diff --git a/Assets/Fungus/Sprite/Commands/FadeSprite.cs b/Assets/Fungus/Sprite/Commands/FadeSprite.cs index 687bf12d..b7a9e513 100644 --- a/Assets/Fungus/Sprite/Commands/FadeSprite.cs +++ b/Assets/Fungus/Sprite/Commands/FadeSprite.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Sprite", "Fade Sprite", diff --git a/Assets/Fungus/Sprite/Commands/ShowSprite.cs b/Assets/Fungus/Sprite/Commands/ShowSprite.cs index 56acc7a7..19aaf0a2 100644 --- a/Assets/Fungus/Sprite/Commands/ShowSprite.cs +++ b/Assets/Fungus/Sprite/Commands/ShowSprite.cs @@ -2,7 +2,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Script +namespace Fungus { [CommandInfo("Sprite", "Show Sprite",