diff --git a/Assets/Fungus/Scripts/Commands/Break.cs b/Assets/Fungus/Scripts/Commands/Break.cs index 8dacca12..4286468f 100644 --- a/Assets/Fungus/Scripts/Commands/Break.cs +++ b/Assets/Fungus/Scripts/Commands/Break.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Force a loop to terminate immediately. diff --git a/Assets/Fungus/Scripts/Commands/Call.cs b/Assets/Fungus/Scripts/Commands/Call.cs index e4ecce44..b1c37b3f 100644 --- a/Assets/Fungus/Scripts/Commands/Call.cs +++ b/Assets/Fungus/Scripts/Commands/Call.cs @@ -6,7 +6,7 @@ using UnityEngine.Serialization; using System.Collections.Generic; using System; -namespace Fungus.Commands +namespace Fungus { /// /// Supported modes for calling a block. diff --git a/Assets/Fungus/Scripts/Commands/CallMethod.cs b/Assets/Fungus/Scripts/Commands/CallMethod.cs index d0d9e718..74f6855a 100644 --- a/Assets/Fungus/Scripts/Commands/CallMethod.cs +++ b/Assets/Fungus/Scripts/Commands/CallMethod.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Calls a named method on a GameObject using the GameObject.SendMessage() system. diff --git a/Assets/Fungus/Scripts/Commands/ClearMenu.cs b/Assets/Fungus/Scripts/Commands/ClearMenu.cs index 85398aab..82722c4a 100644 --- a/Assets/Fungus/Scripts/Commands/ClearMenu.cs +++ b/Assets/Fungus/Scripts/Commands/ClearMenu.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Clears the options from a menu dialogue. diff --git a/Assets/Fungus/Scripts/Commands/Comment.cs b/Assets/Fungus/Scripts/Commands/Comment.cs index 5bc1ef60..66686c02 100644 --- a/Assets/Fungus/Scripts/Commands/Comment.cs +++ b/Assets/Fungus/Scripts/Commands/Comment.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Use comments to record design notes and reminders about your game. diff --git a/Assets/Fungus/Scripts/Commands/Condition.cs b/Assets/Fungus/Scripts/Commands/Condition.cs index 4ce14f6e..d0c4e38f 100644 --- a/Assets/Fungus/Scripts/Commands/Condition.cs +++ b/Assets/Fungus/Scripts/Commands/Condition.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { [AddComponentMenu("")] public abstract class Condition : Command diff --git a/Assets/Fungus/Scripts/Commands/ControlAudio.cs b/Assets/Fungus/Scripts/Commands/ControlAudio.cs index 308f65f8..09677625 100644 --- a/Assets/Fungus/Scripts/Commands/ControlAudio.cs +++ b/Assets/Fungus/Scripts/Commands/ControlAudio.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// The type of audio control to perform. diff --git a/Assets/Fungus/Scripts/Commands/ControlStage.cs b/Assets/Fungus/Scripts/Commands/ControlStage.cs index 2fc2da60..877b79f8 100644 --- a/Assets/Fungus/Scripts/Commands/ControlStage.cs +++ b/Assets/Fungus/Scripts/Commands/ControlStage.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Utils; -namespace Fungus.Commands +namespace Fungus { /// /// Supported display operations for Stage. diff --git a/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs b/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs index b440e018..c6df1b3f 100644 --- a/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs +++ b/Assets/Fungus/Scripts/Commands/ControlWithDisplay.cs @@ -4,7 +4,7 @@ using System; using UnityEngine; -namespace Fungus.Commands +namespace Fungus { public class ControlWithDisplay : Command { diff --git a/Assets/Fungus/Scripts/Commands/Conversation.cs b/Assets/Fungus/Scripts/Commands/Conversation.cs index dd7cd9ec..c7dfb143 100644 --- a/Assets/Fungus/Scripts/Commands/Conversation.cs +++ b/Assets/Fungus/Scripts/Commands/Conversation.cs @@ -3,10 +3,8 @@ using UnityEngine; using System.Collections; -using Fungus.Variables; -using Fungus.Utils; -namespace Fungus.Commands +namespace Fungus { /// /// Do multiple say and portrait commands in a single block of text. Format is: [character] [portrait] [stage position] [: Story text]. diff --git a/Assets/Fungus/Scripts/Commands/DebugLog.cs b/Assets/Fungus/Scripts/Commands/DebugLog.cs index 7579ba6c..fce1c374 100644 --- a/Assets/Fungus/Scripts/Commands/DebugLog.cs +++ b/Assets/Fungus/Scripts/Commands/DebugLog.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Type of log message. Maps directly to Unity's log types. diff --git a/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs b/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs index 76920d1f..28626113 100644 --- a/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs +++ b/Assets/Fungus/Scripts/Commands/DeleteSaveKey.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Deletes a saved value from permanent storage. diff --git a/Assets/Fungus/Scripts/Commands/Destroy.cs b/Assets/Fungus/Scripts/Commands/Destroy.cs index 2e0c5c64..5aa4615f 100644 --- a/Assets/Fungus/Scripts/Commands/Destroy.cs +++ b/Assets/Fungus/Scripts/Commands/Destroy.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Destroys a specified game object in the scene. diff --git a/Assets/Fungus/Scripts/Commands/Else.cs b/Assets/Fungus/Scripts/Commands/Else.cs index c77783ee..be8843ee 100644 --- a/Assets/Fungus/Scripts/Commands/Else.cs +++ b/Assets/Fungus/Scripts/Commands/Else.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Marks the start of a command block to be executed when the preceding If statement is False. diff --git a/Assets/Fungus/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Scripts/Commands/ElseIf.cs index 7e9424a9..e6cabf71 100644 --- a/Assets/Fungus/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Scripts/Commands/ElseIf.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true. diff --git a/Assets/Fungus/Scripts/Commands/End.cs b/Assets/Fungus/Scripts/Commands/End.cs index c4c363a7..5eb798bf 100644 --- a/Assets/Fungus/Scripts/Commands/End.cs +++ b/Assets/Fungus/Scripts/Commands/End.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Marks the end of a conditional block. diff --git a/Assets/Fungus/Scripts/Commands/ExecuteLua.cs b/Assets/Fungus/Scripts/Commands/ExecuteLua.cs index d193efb3..501c45c4 100644 --- a/Assets/Fungus/Scripts/Commands/ExecuteLua.cs +++ b/Assets/Fungus/Scripts/Commands/ExecuteLua.cs @@ -3,10 +3,8 @@ using UnityEngine; using MoonSharp.Interpreter; -using Fungus; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Executes a Lua code chunk using a Lua Environment. diff --git a/Assets/Fungus/Scripts/Commands/FadeScreen.cs b/Assets/Fungus/Scripts/Commands/FadeScreen.cs index d8300d4b..2f6d82c7 100644 --- a/Assets/Fungus/Scripts/Commands/FadeScreen.cs +++ b/Assets/Fungus/Scripts/Commands/FadeScreen.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Draws a fullscreen texture over the scene to give a fade effect. Setting Target Alpha to 1 will obscure the screen, alpha 0 will reveal the screen. diff --git a/Assets/Fungus/Scripts/Commands/FadeSprite.cs b/Assets/Fungus/Scripts/Commands/FadeSprite.cs index 6cd9f113..0d41b643 100644 --- a/Assets/Fungus/Scripts/Commands/FadeSprite.cs +++ b/Assets/Fungus/Scripts/Commands/FadeSprite.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Fades a sprite to a target color over a period of time. diff --git a/Assets/Fungus/Scripts/Commands/FadeToView.cs b/Assets/Fungus/Scripts/Commands/FadeToView.cs index 169895fe..3d1de7dc 100644 --- a/Assets/Fungus/Scripts/Commands/FadeToView.cs +++ b/Assets/Fungus/Scripts/Commands/FadeToView.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Fades the camera out and in again at a position specified by a View object. diff --git a/Assets/Fungus/Scripts/Commands/FadeUI.cs b/Assets/Fungus/Scripts/Commands/FadeUI.cs index 6927a91e..35fb781e 100644 --- a/Assets/Fungus/Scripts/Commands/FadeUI.cs +++ b/Assets/Fungus/Scripts/Commands/FadeUI.cs @@ -3,10 +3,8 @@ using UnityEngine; using UnityEngine.UI; -using Fungus; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Select which type of fade will be applied. diff --git a/Assets/Fungus/Scripts/Commands/Fullscreen.cs b/Assets/Fungus/Scripts/Commands/Fullscreen.cs index c6a852af..88244026 100644 --- a/Assets/Fungus/Scripts/Commands/Fullscreen.cs +++ b/Assets/Fungus/Scripts/Commands/Fullscreen.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Fullscreen mode options. diff --git a/Assets/Fungus/Scripts/Commands/GetText.cs b/Assets/Fungus/Scripts/Commands/GetText.cs index d0f074c4..adc01e7d 100644 --- a/Assets/Fungus/Scripts/Commands/GetText.cs +++ b/Assets/Fungus/Scripts/Commands/GetText.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Gets the text property from a UI Text object and stores it in a string variable. diff --git a/Assets/Fungus/Scripts/Commands/If.cs b/Assets/Fungus/Scripts/Commands/If.cs index fcad60dd..680c17f8 100644 --- a/Assets/Fungus/Scripts/Commands/If.cs +++ b/Assets/Fungus/Scripts/Commands/If.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// If the test expression is true, execute the following command block. diff --git a/Assets/Fungus/Scripts/Commands/InvokeEvent.cs b/Assets/Fungus/Scripts/Commands/InvokeEvent.cs index ef541996..ee563bec 100644 --- a/Assets/Fungus/Scripts/Commands/InvokeEvent.cs +++ b/Assets/Fungus/Scripts/Commands/InvokeEvent.cs @@ -4,9 +4,8 @@ using UnityEngine; using System; using UnityEngine.Events; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Supported types of method invocation. diff --git a/Assets/Fungus/Scripts/Commands/InvokeMethod.cs b/Assets/Fungus/Scripts/Commands/InvokeMethod.cs index a5356734..fd1ee6c5 100644 --- a/Assets/Fungus/Scripts/Commands/InvokeMethod.cs +++ b/Assets/Fungus/Scripts/Commands/InvokeMethod.cs @@ -8,9 +8,8 @@ using System.Collections.Generic; using System; using UnityEngine.Events; using MarkerMetro.Unity.WinLegacy.Reflection; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Invokes a method of a component via reflection. Supports passing multiple parameters and storing returned values in a Fungus variable. diff --git a/Assets/Fungus/Scripts/Commands/Jump.cs b/Assets/Fungus/Scripts/Commands/Jump.cs index c4bd782a..26849578 100644 --- a/Assets/Fungus/Scripts/Commands/Jump.cs +++ b/Assets/Fungus/Scripts/Commands/Jump.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Move execution to a specific Label command in the same block. diff --git a/Assets/Fungus/Scripts/Commands/Label.cs b/Assets/Fungus/Scripts/Commands/Label.cs index c1222cd8..dc64bc96 100644 --- a/Assets/Fungus/Scripts/Commands/Label.cs +++ b/Assets/Fungus/Scripts/Commands/Label.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Marks a position in the command list for execution to jump to. diff --git a/Assets/Fungus/Scripts/Commands/LoadScene.cs b/Assets/Fungus/Scripts/Commands/LoadScene.cs index 495b5d8d..36208348 100644 --- a/Assets/Fungus/Scripts/Commands/LoadScene.cs +++ b/Assets/Fungus/Scripts/Commands/LoadScene.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Loads a new Unity scene and displays an optional loading image. This is useful diff --git a/Assets/Fungus/Scripts/Commands/LoadVariable.cs b/Assets/Fungus/Scripts/Commands/LoadVariable.cs index ac3480be..7c60e4d1 100644 --- a/Assets/Fungus/Scripts/Commands/LoadVariable.cs +++ b/Assets/Fungus/Scripts/Commands/LoadVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Loads a saved value and stores it in a Boolean, Integer, Float or String variable. If the key is not found then the variable is not modified. diff --git a/Assets/Fungus/Scripts/Commands/LookFrom.cs b/Assets/Fungus/Scripts/Commands/LookFrom.cs index ab242383..d3af3c15 100644 --- a/Assets/Fungus/Scripts/Commands/LookFrom.cs +++ b/Assets/Fungus/Scripts/Commands/LookFrom.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Instantly rotates a GameObject to look at the supplied Vector3 then returns it to it's starting rotation over time. diff --git a/Assets/Fungus/Scripts/Commands/LookTo.cs b/Assets/Fungus/Scripts/Commands/LookTo.cs index d71373f6..c785bcce 100644 --- a/Assets/Fungus/Scripts/Commands/LookTo.cs +++ b/Assets/Fungus/Scripts/Commands/LookTo.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Rotates a GameObject to look at a supplied Transform or Vector3 over time. diff --git a/Assets/Fungus/Scripts/Commands/Menu.cs b/Assets/Fungus/Scripts/Commands/Menu.cs index 67bec41a..8980c34f 100644 --- a/Assets/Fungus/Scripts/Commands/Menu.cs +++ b/Assets/Fungus/Scripts/Commands/Menu.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Displays a button in a multiple choice menu. diff --git a/Assets/Fungus/Scripts/Commands/MenuTimer.cs b/Assets/Fungus/Scripts/Commands/MenuTimer.cs index 51a4424b..bec4cffb 100644 --- a/Assets/Fungus/Scripts/Commands/MenuTimer.cs +++ b/Assets/Fungus/Scripts/Commands/MenuTimer.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Displays a timer bar and executes a target block if the player fails to select a menu option in time. diff --git a/Assets/Fungus/Scripts/Commands/MoveAdd.cs b/Assets/Fungus/Scripts/Commands/MoveAdd.cs index 4909ce30..0d518740 100644 --- a/Assets/Fungus/Scripts/Commands/MoveAdd.cs +++ b/Assets/Fungus/Scripts/Commands/MoveAdd.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Moves a game object by a specified offset over time. diff --git a/Assets/Fungus/Scripts/Commands/MoveFrom.cs b/Assets/Fungus/Scripts/Commands/MoveFrom.cs index 8716b9e2..8cc0613b 100644 --- a/Assets/Fungus/Scripts/Commands/MoveFrom.cs +++ b/Assets/Fungus/Scripts/Commands/MoveFrom.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Moves a game object from a specified position back to its starting position over time. The position can be defined by a transform in another object (using To Transform) or by setting an absolute position (using To Position, if To Transform is set to None). diff --git a/Assets/Fungus/Scripts/Commands/MoveTo.cs b/Assets/Fungus/Scripts/Commands/MoveTo.cs index cccb748f..aac0e7bc 100644 --- a/Assets/Fungus/Scripts/Commands/MoveTo.cs +++ b/Assets/Fungus/Scripts/Commands/MoveTo.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Moves a game object to a specified position over time. The position can be defined by a transform in another object (using To Transform) or by setting an absolute position (using To Position, if To Transform is set to None). diff --git a/Assets/Fungus/Scripts/Commands/MoveToView.cs b/Assets/Fungus/Scripts/Commands/MoveToView.cs index 49aca8b5..3f9e4a2b 100644 --- a/Assets/Fungus/Scripts/Commands/MoveToView.cs +++ b/Assets/Fungus/Scripts/Commands/MoveToView.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Moves the camera to a location specified by a View object. diff --git a/Assets/Fungus/Scripts/Commands/OpenURL.cs b/Assets/Fungus/Scripts/Commands/OpenURL.cs index fc0cf62c..21e440e6 100644 --- a/Assets/Fungus/Scripts/Commands/OpenURL.cs +++ b/Assets/Fungus/Scripts/Commands/OpenURL.cs @@ -3,9 +3,8 @@ using UnityEngine; using Fungus; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Opens the specified URL in the browser. diff --git a/Assets/Fungus/Scripts/Commands/PlayAnimState.cs b/Assets/Fungus/Scripts/Commands/PlayAnimState.cs index 485d7eb3..86983b6f 100644 --- a/Assets/Fungus/Scripts/Commands/PlayAnimState.cs +++ b/Assets/Fungus/Scripts/Commands/PlayAnimState.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Plays a state of an animator according to the state name. diff --git a/Assets/Fungus/Scripts/Commands/PlayMusic.cs b/Assets/Fungus/Scripts/Commands/PlayMusic.cs index ddd3bbda..bed4be71 100644 --- a/Assets/Fungus/Scripts/Commands/PlayMusic.cs +++ b/Assets/Fungus/Scripts/Commands/PlayMusic.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Plays looping game music. If any game music is already playing, it is stopped. Game music will continue playing across scene loads. diff --git a/Assets/Fungus/Scripts/Commands/PlaySound.cs b/Assets/Fungus/Scripts/Commands/PlaySound.cs index b929bb2a..bb96c728 100644 --- a/Assets/Fungus/Scripts/Commands/PlaySound.cs +++ b/Assets/Fungus/Scripts/Commands/PlaySound.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Plays a once-off sound effect. Multiple sound effects can be played at the same time. diff --git a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs index 764370a2..b61e005c 100644 --- a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs +++ b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs @@ -4,9 +4,8 @@ using System; using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Plays a usfxr synth sound. Use the usfxr editor [Tools > Fungus > Utilities > Generate usfxr Sound Effects] to create the SettingsString. Set a ParentTransform if using positional sound. See https://github.com/zeh/usfxr for more information about usfxr. diff --git a/Assets/Fungus/Scripts/Commands/Portrait.cs b/Assets/Fungus/Scripts/Commands/Portrait.cs index 310c8bbd..5d2bc731 100644 --- a/Assets/Fungus/Scripts/Commands/Portrait.cs +++ b/Assets/Fungus/Scripts/Commands/Portrait.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Utils; -namespace Fungus.Commands +namespace Fungus { /// /// Controls a character portrait. diff --git a/Assets/Fungus/Scripts/Commands/PunchPosition.cs b/Assets/Fungus/Scripts/Commands/PunchPosition.cs index 9b57c96b..4f02620c 100644 --- a/Assets/Fungus/Scripts/Commands/PunchPosition.cs +++ b/Assets/Fungus/Scripts/Commands/PunchPosition.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Applies a jolt of force to a GameObject's position and wobbles it back to its initial position. diff --git a/Assets/Fungus/Scripts/Commands/PunchRotation.cs b/Assets/Fungus/Scripts/Commands/PunchRotation.cs index afb104cb..4fab9d73 100644 --- a/Assets/Fungus/Scripts/Commands/PunchRotation.cs +++ b/Assets/Fungus/Scripts/Commands/PunchRotation.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Applies a jolt of force to a GameObject's rotation and wobbles it back to its initial rotation. diff --git a/Assets/Fungus/Scripts/Commands/PunchScale.cs b/Assets/Fungus/Scripts/Commands/PunchScale.cs index 181effac..2775eec2 100644 --- a/Assets/Fungus/Scripts/Commands/PunchScale.cs +++ b/Assets/Fungus/Scripts/Commands/PunchScale.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Applies a jolt of force to a GameObject's scale and wobbles it back to its initial scale. diff --git a/Assets/Fungus/Scripts/Commands/Quit.cs b/Assets/Fungus/Scripts/Commands/Quit.cs index 98314427..7720b105 100644 --- a/Assets/Fungus/Scripts/Commands/Quit.cs +++ b/Assets/Fungus/Scripts/Commands/Quit.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Quits the application. Does not work in Editor or Webplayer builds. Shouldn't generally be used on iOS. diff --git a/Assets/Fungus/Scripts/Commands/RandomFloat.cs b/Assets/Fungus/Scripts/Commands/RandomFloat.cs index 00953272..8ebcbcbc 100644 --- a/Assets/Fungus/Scripts/Commands/RandomFloat.cs +++ b/Assets/Fungus/Scripts/Commands/RandomFloat.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets an float variable to a random value in the defined range. diff --git a/Assets/Fungus/Scripts/Commands/RandomInteger.cs b/Assets/Fungus/Scripts/Commands/RandomInteger.cs index f4fb0fdc..7e238a90 100644 --- a/Assets/Fungus/Scripts/Commands/RandomInteger.cs +++ b/Assets/Fungus/Scripts/Commands/RandomInteger.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets an integer variable to a random value in the defined range. diff --git a/Assets/Fungus/Scripts/Commands/ReadTextFile.cs b/Assets/Fungus/Scripts/Commands/ReadTextFile.cs index 65626128..8c503ba6 100644 --- a/Assets/Fungus/Scripts/Commands/ReadTextFile.cs +++ b/Assets/Fungus/Scripts/Commands/ReadTextFile.cs @@ -3,9 +3,8 @@ using UnityEngine; using Fungus; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Reads in a text file and stores the contents in a string variable. diff --git a/Assets/Fungus/Scripts/Commands/Reset.cs b/Assets/Fungus/Scripts/Commands/Reset.cs index b2cdcfc3..6cda41f0 100644 --- a/Assets/Fungus/Scripts/Commands/Reset.cs +++ b/Assets/Fungus/Scripts/Commands/Reset.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Resets the state of all commands and variables in the Flowchart. diff --git a/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs b/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs index 5c6cdafb..f43c4774 100644 --- a/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs +++ b/Assets/Fungus/Scripts/Commands/ResetAnimTrigger.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Resets a trigger parameter on an Animator component. diff --git a/Assets/Fungus/Scripts/Commands/RotateAdd.cs b/Assets/Fungus/Scripts/Commands/RotateAdd.cs index b2a019fe..f4dcd663 100644 --- a/Assets/Fungus/Scripts/Commands/RotateAdd.cs +++ b/Assets/Fungus/Scripts/Commands/RotateAdd.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Rotates a game object by the specified angles over time. diff --git a/Assets/Fungus/Scripts/Commands/RotateFrom.cs b/Assets/Fungus/Scripts/Commands/RotateFrom.cs index a8ba3e4f..f3797fde 100644 --- a/Assets/Fungus/Scripts/Commands/RotateFrom.cs +++ b/Assets/Fungus/Scripts/Commands/RotateFrom.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Rotates a game object from the specified angles back to its starting orientation over time. diff --git a/Assets/Fungus/Scripts/Commands/RotateTo.cs b/Assets/Fungus/Scripts/Commands/RotateTo.cs index f0f67d0a..1a6a1b33 100644 --- a/Assets/Fungus/Scripts/Commands/RotateTo.cs +++ b/Assets/Fungus/Scripts/Commands/RotateTo.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Rotates a game object to the specified angles over time. diff --git a/Assets/Fungus/Scripts/Commands/SaveVariable.cs b/Assets/Fungus/Scripts/Commands/SaveVariable.cs index df640bf3..bbdc5a1f 100644 --- a/Assets/Fungus/Scripts/Commands/SaveVariable.cs +++ b/Assets/Fungus/Scripts/Commands/SaveVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Save an Boolean, Integer, Float or String variable to persistent storage using a string key. diff --git a/Assets/Fungus/Scripts/Commands/Say.cs b/Assets/Fungus/Scripts/Commands/Say.cs index d6db89f5..aae38e81 100644 --- a/Assets/Fungus/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Scripts/Commands/Say.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Writes text in a dialog box. diff --git a/Assets/Fungus/Scripts/Commands/ScaleAdd.cs b/Assets/Fungus/Scripts/Commands/ScaleAdd.cs index d1c4ddb4..6dd633f2 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleAdd.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleAdd.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Changes a game object's scale by a specified offset over time. diff --git a/Assets/Fungus/Scripts/Commands/ScaleFrom.cs b/Assets/Fungus/Scripts/Commands/ScaleFrom.cs index 51cdfa9e..1376c2ab 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleFrom.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleFrom.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Changes a game object's scale to the specified value and back to its original scale over time. diff --git a/Assets/Fungus/Scripts/Commands/ScaleTo.cs b/Assets/Fungus/Scripts/Commands/ScaleTo.cs index c53a38af..4baeb3e5 100644 --- a/Assets/Fungus/Scripts/Commands/ScaleTo.cs +++ b/Assets/Fungus/Scripts/Commands/ScaleTo.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Changes a game object's scale to a specified value over time. diff --git a/Assets/Fungus/Scripts/Commands/SendMessage.cs b/Assets/Fungus/Scripts/Commands/SendMessage.cs index 2c2692ed..a9499ed4 100644 --- a/Assets/Fungus/Scripts/Commands/SendMessage.cs +++ b/Assets/Fungus/Scripts/Commands/SendMessage.cs @@ -3,10 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -using Fungus.EventHandlers; -namespace Fungus.Commands +namespace Fungus { /// /// Supported target types for messages. diff --git a/Assets/Fungus/Scripts/Commands/SetActive.cs b/Assets/Fungus/Scripts/Commands/SetActive.cs index 4bb9c9b2..4a6f11bc 100644 --- a/Assets/Fungus/Scripts/Commands/SetActive.cs +++ b/Assets/Fungus/Scripts/Commands/SetActive.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a game object in the scene to be active / inactive. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimBool.cs b/Assets/Fungus/Scripts/Commands/SetAnimBool.cs index feff71e1..a4b9290d 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimBool.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimBool.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a boolean parameter on an Animator component to control a Unity animation" diff --git a/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs b/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs index 43985c44..9494e542 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimFloat.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a float parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs b/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs index db638a72..8f07d4fd 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimInteger.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets an integer parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs b/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs index 03c19eb1..d7843e7a 100644 --- a/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs +++ b/Assets/Fungus/Scripts/Commands/SetAnimTrigger.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a trigger parameter on an Animator component to control a Unity animation. diff --git a/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs b/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs index 1052a86e..6053d27a 100644 --- a/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs +++ b/Assets/Fungus/Scripts/Commands/SetAudioPitch.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the global pitch level for audio played with Play Music and Play Sound commands. diff --git a/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs b/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs index e36c975b..be9c9d75 100644 --- a/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs +++ b/Assets/Fungus/Scripts/Commands/SetAudioVolume.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the global volume level for audio played with Play Music and Play Sound commands. diff --git a/Assets/Fungus/Scripts/Commands/SetClickable2D.cs b/Assets/Fungus/Scripts/Commands/SetClickable2D.cs index 488fcf82..80138ed7 100644 --- a/Assets/Fungus/Scripts/Commands/SetClickable2D.cs +++ b/Assets/Fungus/Scripts/Commands/SetClickable2D.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a Clickable2D component to be clickable / non-clickable. diff --git a/Assets/Fungus/Scripts/Commands/SetCollider.cs b/Assets/Fungus/Scripts/Commands/SetCollider.cs index dfb04709..2d8ea4a1 100644 --- a/Assets/Fungus/Scripts/Commands/SetCollider.cs +++ b/Assets/Fungus/Scripts/Commands/SetCollider.cs @@ -3,9 +3,8 @@ using UnityEngine; using System.Collections.Generic; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets all collider (2d or 3d) components on the target objects to be active / inactive. diff --git a/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs b/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs index eba99d71..c5e0ff6a 100644 --- a/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs +++ b/Assets/Fungus/Scripts/Commands/SetDraggable2D.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a Draggable2D component to be draggable / non-draggable. diff --git a/Assets/Fungus/Scripts/Commands/SetInteractable.cs b/Assets/Fungus/Scripts/Commands/SetInteractable.cs index 29fd3d29..07f54537 100644 --- a/Assets/Fungus/Scripts/Commands/SetInteractable.cs +++ b/Assets/Fungus/Scripts/Commands/SetInteractable.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.UI; using System.Collections.Generic; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Set the interactable state of selectable objects. diff --git a/Assets/Fungus/Scripts/Commands/SetLanguage.cs b/Assets/Fungus/Scripts/Commands/SetLanguage.cs index 1aae5a83..2c6aae9f 100644 --- a/Assets/Fungus/Scripts/Commands/SetLanguage.cs +++ b/Assets/Fungus/Scripts/Commands/SetLanguage.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Set the active language for the scene. A Localization object with a localization file must be present in the scene. diff --git a/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs b/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs index d57fff4e..112d37c7 100644 --- a/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs +++ b/Assets/Fungus/Scripts/Commands/SetLayerOrder.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the Renderer sorting layer of every child of a game object. Applies to all Renderers (including mesh, skinned mesh, and sprite). diff --git a/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs b/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs index 93925c17..04ac2fc8 100644 --- a/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs +++ b/Assets/Fungus/Scripts/Commands/SetMenuDialog.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a custom menu dialog to use when displaying multiple choice menus. diff --git a/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs b/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs index a54d8c4a..cc75ff6f 100644 --- a/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs +++ b/Assets/Fungus/Scripts/Commands/SetMouseCursor.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the mouse cursor sprite. diff --git a/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs b/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs index 38932c14..bd6c5d60 100644 --- a/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs +++ b/Assets/Fungus/Scripts/Commands/SetSaveProfile.cs @@ -5,7 +5,7 @@ using UnityEngine; using System; using System.Collections; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the active profile that the Save Variable and Load Variable commands will use. This is useful to crete multiple player save games. Once set, the profile applies across all Flowcharts and will also persist across scene loads. diff --git a/Assets/Fungus/Scripts/Commands/SetSayDialog.cs b/Assets/Fungus/Scripts/Commands/SetSayDialog.cs index 09501a99..57e6bf64 100644 --- a/Assets/Fungus/Scripts/Commands/SetSayDialog.cs +++ b/Assets/Fungus/Scripts/Commands/SetSayDialog.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Sets a custom say dialog to use when displaying story text. diff --git a/Assets/Fungus/Scripts/Commands/SetSliderValue.cs b/Assets/Fungus/Scripts/Commands/SetSliderValue.cs index e67d7883..f014a747 100644 --- a/Assets/Fungus/Scripts/Commands/SetSliderValue.cs +++ b/Assets/Fungus/Scripts/Commands/SetSliderValue.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.UI; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the value property of a slider object. diff --git a/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs b/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs index 77588824..96c8300e 100644 --- a/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs +++ b/Assets/Fungus/Scripts/Commands/SetSpriteOrder.cs @@ -3,9 +3,8 @@ using UnityEngine; using System.Collections.Generic; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Controls the render order of sprites by setting the Order In Layer property of a list of sprites. diff --git a/Assets/Fungus/Scripts/Commands/SetText.cs b/Assets/Fungus/Scripts/Commands/SetText.cs index b0d1b0f8..0f87a67b 100644 --- a/Assets/Fungus/Scripts/Commands/SetText.cs +++ b/Assets/Fungus/Scripts/Commands/SetText.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Sets the text property on a UI Text object and/or an Input Field object. diff --git a/Assets/Fungus/Scripts/Commands/SetVariable.cs b/Assets/Fungus/Scripts/Commands/SetVariable.cs index 2f57972b..051ac006 100644 --- a/Assets/Fungus/Scripts/Commands/SetVariable.cs +++ b/Assets/Fungus/Scripts/Commands/SetVariable.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Mathematical operations that can be performed on variables. diff --git a/Assets/Fungus/Scripts/Commands/ShakeCamera.cs b/Assets/Fungus/Scripts/Commands/ShakeCamera.cs index 1290d2ba..e64249a9 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeCamera.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeCamera.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Commands +namespace Fungus { /// /// Applies a camera shake effect to the main camera. diff --git a/Assets/Fungus/Scripts/Commands/ShakePosition.cs b/Assets/Fungus/Scripts/Commands/ShakePosition.cs index c79c268c..4432d068 100644 --- a/Assets/Fungus/Scripts/Commands/ShakePosition.cs +++ b/Assets/Fungus/Scripts/Commands/ShakePosition.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Randomly shakes a GameObject's position by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShakeRotation.cs b/Assets/Fungus/Scripts/Commands/ShakeRotation.cs index 366e1fdf..a4838efd 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeRotation.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeRotation.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Randomly shakes a GameObject's rotation by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShakeScale.cs b/Assets/Fungus/Scripts/Commands/ShakeScale.cs index 290121f2..6a3434d4 100644 --- a/Assets/Fungus/Scripts/Commands/ShakeScale.cs +++ b/Assets/Fungus/Scripts/Commands/ShakeScale.cs @@ -4,9 +4,8 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Randomly shakes a GameObject's rotation by a diminishing amount over time. diff --git a/Assets/Fungus/Scripts/Commands/ShowSprite.cs b/Assets/Fungus/Scripts/Commands/ShowSprite.cs index 621c0333..ed5bc62e 100644 --- a/Assets/Fungus/Scripts/Commands/ShowSprite.cs +++ b/Assets/Fungus/Scripts/Commands/ShowSprite.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Makes a sprite visible / invisible by setting the color alpha. diff --git a/Assets/Fungus/Scripts/Commands/SpawnObject.cs b/Assets/Fungus/Scripts/Commands/SpawnObject.cs index e4c35dab..734243f3 100644 --- a/Assets/Fungus/Scripts/Commands/SpawnObject.cs +++ b/Assets/Fungus/Scripts/Commands/SpawnObject.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Spawns a new object based on a reference to a scene or prefab game object. diff --git a/Assets/Fungus/Scripts/Commands/StartSwipe.cs b/Assets/Fungus/Scripts/Commands/StartSwipe.cs index 3f775d8d..d20b52f3 100644 --- a/Assets/Fungus/Scripts/Commands/StartSwipe.cs +++ b/Assets/Fungus/Scripts/Commands/StartSwipe.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Activates swipe panning mode where the player can pan the camera within the area between viewA & viewB. diff --git a/Assets/Fungus/Scripts/Commands/Stop.cs b/Assets/Fungus/Scripts/Commands/Stop.cs index f1b7909a..3dc485b9 100644 --- a/Assets/Fungus/Scripts/Commands/Stop.cs +++ b/Assets/Fungus/Scripts/Commands/Stop.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Stop executing the Block that contains this command. diff --git a/Assets/Fungus/Scripts/Commands/StopBlock.cs b/Assets/Fungus/Scripts/Commands/StopBlock.cs index a7aeef2f..125045d4 100644 --- a/Assets/Fungus/Scripts/Commands/StopBlock.cs +++ b/Assets/Fungus/Scripts/Commands/StopBlock.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Stops executing the named Block. diff --git a/Assets/Fungus/Scripts/Commands/StopFlowchart.cs b/Assets/Fungus/Scripts/Commands/StopFlowchart.cs index 7dad5ab5..b295b2dc 100644 --- a/Assets/Fungus/Scripts/Commands/StopFlowchart.cs +++ b/Assets/Fungus/Scripts/Commands/StopFlowchart.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Fungus.Commands +namespace Fungus { /// /// Stops execution of all Blocks in a Flowchart. diff --git a/Assets/Fungus/Scripts/Commands/StopMusic.cs b/Assets/Fungus/Scripts/Commands/StopMusic.cs index 59e8d9d8..548fd091 100644 --- a/Assets/Fungus/Scripts/Commands/StopMusic.cs +++ b/Assets/Fungus/Scripts/Commands/StopMusic.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Stops the currently playing game music. diff --git a/Assets/Fungus/Scripts/Commands/StopSwipe.cs b/Assets/Fungus/Scripts/Commands/StopSwipe.cs index e947d751..534dcf5b 100644 --- a/Assets/Fungus/Scripts/Commands/StopSwipe.cs +++ b/Assets/Fungus/Scripts/Commands/StopSwipe.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Deactivates swipe panning mode. diff --git a/Assets/Fungus/Scripts/Commands/StopTween.cs b/Assets/Fungus/Scripts/Commands/StopTween.cs index a6d3edaf..059bf75e 100644 --- a/Assets/Fungus/Scripts/Commands/StopTween.cs +++ b/Assets/Fungus/Scripts/Commands/StopTween.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Stops an active iTween by name. diff --git a/Assets/Fungus/Scripts/Commands/StopTweens.cs b/Assets/Fungus/Scripts/Commands/StopTweens.cs index bdac4d10..3e2bfb17 100644 --- a/Assets/Fungus/Scripts/Commands/StopTweens.cs +++ b/Assets/Fungus/Scripts/Commands/StopTweens.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Stop all active iTweens in the current scene. diff --git a/Assets/Fungus/Scripts/Commands/TweenUI.cs b/Assets/Fungus/Scripts/Commands/TweenUI.cs index 9d8cfd4f..8803d455 100644 --- a/Assets/Fungus/Scripts/Commands/TweenUI.cs +++ b/Assets/Fungus/Scripts/Commands/TweenUI.cs @@ -4,9 +4,8 @@ using UnityEngine; using System.Collections.Generic; using Fungus; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Abstract base class for TweenUI commands. diff --git a/Assets/Fungus/Scripts/Commands/Wait.cs b/Assets/Fungus/Scripts/Commands/Wait.cs index b02989ce..6299217c 100644 --- a/Assets/Fungus/Scripts/Commands/Wait.cs +++ b/Assets/Fungus/Scripts/Commands/Wait.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Waits for period of time before executing the next command in the block. diff --git a/Assets/Fungus/Scripts/Commands/While.cs b/Assets/Fungus/Scripts/Commands/While.cs index 4687ab2b..9e4f696c 100644 --- a/Assets/Fungus/Scripts/Commands/While.cs +++ b/Assets/Fungus/Scripts/Commands/While.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Commands +namespace Fungus { /// /// Continuously loop through a block of commands while the condition is true. Use the Break command to force the loop to terminate immediately. diff --git a/Assets/Fungus/Scripts/Commands/Write.cs b/Assets/Fungus/Scripts/Commands/Write.cs index 912f7e87..5ce063f1 100644 --- a/Assets/Fungus/Scripts/Commands/Write.cs +++ b/Assets/Fungus/Scripts/Commands/Write.cs @@ -2,9 +2,8 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Text coloring mode for Write command. diff --git a/Assets/Fungus/Scripts/Commands/iTweenCommand.cs b/Assets/Fungus/Scripts/Commands/iTweenCommand.cs index a8124430..f5b12832 100644 --- a/Assets/Fungus/Scripts/Commands/iTweenCommand.cs +++ b/Assets/Fungus/Scripts/Commands/iTweenCommand.cs @@ -3,9 +3,8 @@ using UnityEngine; using UnityEngine.Serialization; -using Fungus.Variables; -namespace Fungus.Commands +namespace Fungus { /// /// Axis to apply the tween on. diff --git a/Assets/Fungus/Scripts/Components/Block.cs b/Assets/Fungus/Scripts/Components/Block.cs index b6ff2c32..65296820 100644 --- a/Assets/Fungus/Scripts/Components/Block.cs +++ b/Assets/Fungus/Scripts/Components/Block.cs @@ -6,8 +6,6 @@ using UnityEngine.Serialization; using System; using System.Collections; using System.Collections.Generic; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Character.cs b/Assets/Fungus/Scripts/Components/Character.cs index 250175fe..18e57682 100644 --- a/Assets/Fungus/Scripts/Components/Character.cs +++ b/Assets/Fungus/Scripts/Components/Character.cs @@ -5,7 +5,6 @@ using UnityEngine; using UnityEngine.Serialization; using System.Collections.Generic; using System; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Clickable2D.cs b/Assets/Fungus/Scripts/Components/Clickable2D.cs index 1efe3272..854836e2 100644 --- a/Assets/Fungus/Scripts/Components/Clickable2D.cs +++ b/Assets/Fungus/Scripts/Components/Clickable2D.cs @@ -3,8 +3,6 @@ using UnityEngine; using UnityEngine.EventSystems; -using Fungus.EventHandlers; -using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Draggable2D.cs b/Assets/Fungus/Scripts/Components/Draggable2D.cs index 3b71dda0..aff5bf3b 100644 --- a/Assets/Fungus/Scripts/Components/Draggable2D.cs +++ b/Assets/Fungus/Scripts/Components/Draggable2D.cs @@ -4,8 +4,6 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.Serialization; -using Fungus.EventHandlers; -using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Flowchart.cs b/Assets/Fungus/Scripts/Components/Flowchart.cs index 0b6b5f57..8c51eb4b 100644 --- a/Assets/Fungus/Scripts/Components/Flowchart.cs +++ b/Assets/Fungus/Scripts/Components/Flowchart.cs @@ -9,10 +9,6 @@ using System.Text; using System.Linq; using System.Collections.Generic; using System.Text.RegularExpressions; -using Fungus.Commands; -using Fungus.EventHandlers; -using Fungus.Utils; -using Fungus.Variables; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Localization.cs b/Assets/Fungus/Scripts/Components/Localization.cs index 3b45c3e4..b437fe20 100644 --- a/Assets/Fungus/Scripts/Components/Localization.cs +++ b/Assets/Fungus/Scripts/Components/Localization.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.Text; using Ideafixxxer.CsvParser; -using Fungus.Commands; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/PortraitController.cs b/Assets/Fungus/Scripts/Components/PortraitController.cs index 58e1988b..35ce8879 100644 --- a/Assets/Fungus/Scripts/Components/PortraitController.cs +++ b/Assets/Fungus/Scripts/Components/PortraitController.cs @@ -6,7 +6,6 @@ using UnityEngine.UI; using System; using System.Collections; using MoonSharp.Interpreter; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Components/Writer.cs b/Assets/Fungus/Scripts/Components/Writer.cs index e26baba2..b16efe72 100644 --- a/Assets/Fungus/Scripts/Components/Writer.cs +++ b/Assets/Fungus/Scripts/Components/Writer.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System; using System.Reflection; using System.Text; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Fungus/Scripts/Editor/CallEditor.cs b/Assets/Fungus/Scripts/Editor/CallEditor.cs index e9970d97..d2c6c4b7 100644 --- a/Assets/Fungus/Scripts/Editor/CallEditor.cs +++ b/Assets/Fungus/Scripts/Editor/CallEditor.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs index 9a0fe30d..1a141553 100644 --- a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs +++ b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs @@ -9,8 +9,6 @@ using UnityEngine; using UnityEditor; using System; using Rotorz.ReorderableList; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs b/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs index 383bcebb..597cf62c 100644 --- a/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs +++ b/Assets/Fungus/Scripts/Editor/ControlAudioEditor.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs b/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs index 8d140b13..4627478d 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartMenuItems.cs @@ -3,7 +3,6 @@ using UnityEngine; using UnityEditor; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs index 799c7295..5226b26e 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs @@ -7,7 +7,6 @@ using UnityEditorInternal; using System; using System.Linq; using System.Collections.Generic; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/IfEditor.cs b/Assets/Fungus/Scripts/Editor/IfEditor.cs index 5887502d..fe215732 100644 --- a/Assets/Fungus/Scripts/Editor/IfEditor.cs +++ b/Assets/Fungus/Scripts/Editor/IfEditor.cs @@ -4,8 +4,6 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; -using Fungus.Commands; -using Fungus.Variables; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs b/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs index bb023c8d..1724b95e 100644 --- a/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs +++ b/Assets/Fungus/Scripts/Editor/InvokeEventEditor.cs @@ -2,7 +2,6 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEditor; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs b/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs index 6c785bd9..6058383a 100644 --- a/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs +++ b/Assets/Fungus/Scripts/Editor/InvokeMethodEditor.cs @@ -8,8 +8,6 @@ using System.Linq; using System.Reflection; using System; using System.Collections.Generic; -using Fungus.Commands; -using Fungus.Variables; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/LabelEditor.cs b/Assets/Fungus/Scripts/Editor/LabelEditor.cs index 9ce82f87..3c9549c7 100644 --- a/Assets/Fungus/Scripts/Editor/LabelEditor.cs +++ b/Assets/Fungus/Scripts/Editor/LabelEditor.cs @@ -4,7 +4,6 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/MenuEditor.cs b/Assets/Fungus/Scripts/Editor/MenuEditor.cs index ad9e2bfa..0ca3568e 100644 --- a/Assets/Fungus/Scripts/Editor/MenuEditor.cs +++ b/Assets/Fungus/Scripts/Editor/MenuEditor.cs @@ -3,11 +3,10 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; namespace Fungus.EditorUtils { - [CustomEditor (typeof(Fungus.Commands.Menu))] + [CustomEditor (typeof(Menu))] public class MenuEditor : CommandEditor { protected SerializedProperty textProp; diff --git a/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs b/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs index 91bcf372..ab9ab970 100644 --- a/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs +++ b/Assets/Fungus/Scripts/Editor/MenuTimerEditor.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/PortraitEditor.cs b/Assets/Fungus/Scripts/Editor/PortraitEditor.cs index 7639c5ee..24c8111e 100644 --- a/Assets/Fungus/Scripts/Editor/PortraitEditor.cs +++ b/Assets/Fungus/Scripts/Editor/PortraitEditor.cs @@ -3,8 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/SayEditor.cs b/Assets/Fungus/Scripts/Editor/SayEditor.cs index bd731df0..98e5e425 100644 --- a/Assets/Fungus/Scripts/Editor/SayEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SayEditor.cs @@ -4,8 +4,6 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs b/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs index 051ac99e..6abbf209 100644 --- a/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SetColliderEditor.cs @@ -4,7 +4,6 @@ using UnityEditor; using UnityEngine; using Rotorz.ReorderableList; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs b/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs index 49f2d2fd..e14936d0 100644 --- a/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs +++ b/Assets/Fungus/Scripts/Editor/SetVariableEditor.cs @@ -4,8 +4,6 @@ using UnityEditor; using UnityEngine; using System.Collections.Generic; -using Fungus.Commands; -using Fungus.Variables; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/StageEditor.cs b/Assets/Fungus/Scripts/Editor/StageEditor.cs index 18f158ff..0cbaf179 100644 --- a/Assets/Fungus/Scripts/Editor/StageEditor.cs +++ b/Assets/Fungus/Scripts/Editor/StageEditor.cs @@ -3,8 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/VariableEditor.cs b/Assets/Fungus/Scripts/Editor/VariableEditor.cs index b7bbcd02..9b368fd7 100644 --- a/Assets/Fungus/Scripts/Editor/VariableEditor.cs +++ b/Assets/Fungus/Scripts/Editor/VariableEditor.cs @@ -6,7 +6,6 @@ using UnityEngine; using System; using System.Collections.Generic; using System.Linq; -using Fungus.Variables; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/ViewEditor.cs b/Assets/Fungus/Scripts/Editor/ViewEditor.cs index 9172d891..4a21b008 100644 --- a/Assets/Fungus/Scripts/Editor/ViewEditor.cs +++ b/Assets/Fungus/Scripts/Editor/ViewEditor.cs @@ -3,7 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/Editor/WriteEditor.cs b/Assets/Fungus/Scripts/Editor/WriteEditor.cs index f00dd5cd..354a28d3 100644 --- a/Assets/Fungus/Scripts/Editor/WriteEditor.cs +++ b/Assets/Fungus/Scripts/Editor/WriteEditor.cs @@ -3,8 +3,6 @@ using UnityEditor; using UnityEngine; -using Fungus.Commands; -using Fungus.Utils; namespace Fungus.EditorUtils { diff --git a/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs b/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs index 96d0f81c..38425380 100644 --- a/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs +++ b/Assets/Fungus/Scripts/EventHandlers/ButtonClicked.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the user clicks on the target UI button object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs b/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs index 4aec3cc8..5a369111 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the player drags an object and releases it without dropping it on a target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs b/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs index 899f7f44..63240d76 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragCompleted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the player drags an object and successfully drops it on a target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs b/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs index 31653053..3b9674f0 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragEntered.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the player is dragging an object which starts touching the target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragExited.cs b/Assets/Fungus/Scripts/EventHandlers/DragExited.cs index d6a15b9d..9381a7d6 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragExited.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragExited.cs @@ -6,7 +6,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the player is dragging an object which stops touching the target object. diff --git a/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs b/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs index e35aecc3..90d00a81 100644 --- a/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/DragStarted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the player starts dragging an object. diff --git a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs index 88849482..2ca80601 100644 --- a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs +++ b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.UI; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the user finishes editing the text in the input field. diff --git a/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs b/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs index ae098ec7..50c78d43 100644 --- a/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs +++ b/Assets/Fungus/Scripts/EventHandlers/FlowchartEnabled.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the Flowchart game object is enabled. diff --git a/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs b/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs index 96534451..39891c41 100644 --- a/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs +++ b/Assets/Fungus/Scripts/EventHandlers/GameStarted.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the game starts playing. diff --git a/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs b/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs index cec8b7e5..4bd6147d 100644 --- a/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs +++ b/Assets/Fungus/Scripts/EventHandlers/KeyPressed.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// Key press modes supported by Key Pressed event handler. diff --git a/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs b/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs index c6faad78..79a36258 100644 --- a/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs +++ b/Assets/Fungus/Scripts/EventHandlers/MessageReceived.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the specified message is received from a Send Message command. diff --git a/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs b/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs index 92eee8f6..d3c653ad 100644 --- a/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs +++ b/Assets/Fungus/Scripts/EventHandlers/ObjectClicked.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.EventHandlers +namespace Fungus { /// /// The block will execute when the user clicks or taps on the clickable object. diff --git a/Assets/Fungus/Scripts/Signals/WriterSignals.cs b/Assets/Fungus/Scripts/Signals/WriterSignals.cs index 0bfeb3af..8c8419c5 100644 --- a/Assets/Fungus/Scripts/Signals/WriterSignals.cs +++ b/Assets/Fungus/Scripts/Signals/WriterSignals.cs @@ -1,8 +1,6 @@ // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) -using Fungus.Utils; - namespace Fungus { /// diff --git a/Assets/Fungus/Scripts/Utils/ConversationManager.cs b/Assets/Fungus/Scripts/Utils/ConversationManager.cs index 619e2360..bca3f000 100644 --- a/Assets/Fungus/Scripts/Utils/ConversationManager.cs +++ b/Assets/Fungus/Scripts/Utils/ConversationManager.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using UnityEngine; using System.Text; -namespace Fungus.Utils +namespace Fungus { /// /// Helper class to manage parsing and executing the conversation format. diff --git a/Assets/Fungus/Scripts/Utils/FungusConstants.cs b/Assets/Fungus/Scripts/Utils/FungusConstants.cs index 75480ce3..a8af062b 100644 --- a/Assets/Fungus/Scripts/Utils/FungusConstants.cs +++ b/Assets/Fungus/Scripts/Utils/FungusConstants.cs @@ -1,7 +1,7 @@ // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) -namespace Fungus.Utils +namespace Fungus { /// /// Global constants used in various parts of Fungus. diff --git a/Assets/Fungus/Scripts/Utils/PortraitUtils.cs b/Assets/Fungus/Scripts/Utils/PortraitUtils.cs index a40d4d84..b59e6f0c 100644 --- a/Assets/Fungus/Scripts/Utils/PortraitUtils.cs +++ b/Assets/Fungus/Scripts/Utils/PortraitUtils.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.UI; using MoonSharp.Interpreter; -namespace Fungus.Utils +namespace Fungus { /// /// Contains all options to run a portrait command. diff --git a/Assets/Fungus/Scripts/Utils/StringFormatter.cs b/Assets/Fungus/Scripts/Utils/StringFormatter.cs index e7e1a202..2945319e 100644 --- a/Assets/Fungus/Scripts/Utils/StringFormatter.cs +++ b/Assets/Fungus/Scripts/Utils/StringFormatter.cs @@ -4,7 +4,7 @@ using System.Text; using System; -namespace Fungus.Utils +namespace Fungus { /// /// Misc string formatting functions. diff --git a/Assets/Fungus/Scripts/Utils/TextTagParser.cs b/Assets/Fungus/Scripts/Utils/TextTagParser.cs index 29184b9c..1d9dcf57 100644 --- a/Assets/Fungus/Scripts/Utils/TextTagParser.cs +++ b/Assets/Fungus/Scripts/Utils/TextTagParser.cs @@ -5,7 +5,7 @@ using UnityEngine; using System.Collections.Generic; using System.Text.RegularExpressions; -namespace Fungus.Utils +namespace Fungus { /// /// Parses a string for special Fungus text tags. diff --git a/Assets/Fungus/Scripts/Utils/TextTagToken.cs b/Assets/Fungus/Scripts/Utils/TextTagToken.cs index 02370d05..7dd52fb2 100644 --- a/Assets/Fungus/Scripts/Utils/TextTagToken.cs +++ b/Assets/Fungus/Scripts/Utils/TextTagToken.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Fungus.Utils +namespace Fungus { /// /// Supported token types for use in Say / Write text. diff --git a/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs b/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs index 1ded4b0f..39a411e0 100644 --- a/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/AnimatorVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// Animator variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs b/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs index 0170b312..5727e4a4 100644 --- a/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/AudioSourceVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// AudioSource variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs b/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs index 4294326c..79a96331 100644 --- a/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/BooleanVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// Boolean variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs b/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs index 7069ff9a..f27c32ca 100644 --- a/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/ColorVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Color variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs b/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs index 93b32210..93c0349d 100644 --- a/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/FloatVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// Float variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs b/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs index bbcf2e4e..8a67c671 100644 --- a/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/GameObjectVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// GameObject variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs b/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs index 1ba0f822..ab477453 100644 --- a/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/IntegerVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// Integer variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs b/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs index 84a8719d..5f36ff87 100644 --- a/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/MaterialVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Material variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs b/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs index d832df48..1d3fcb9d 100644 --- a/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/ObjectVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Object variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs b/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs index 51918fb2..ca7a0d63 100644 --- a/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/SpriteVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Sprite variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs b/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs index 44a9b715..efb8c4a5 100644 --- a/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/StringVariable.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace Fungus.Variables +namespace Fungus { /// /// String variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs b/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs index 1d5fe109..ad446a9f 100644 --- a/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/TextureVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Texture variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs b/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs index c2551382..bbc32db4 100644 --- a/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/TransformVariable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Transform variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs b/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs index eeca6042..f067aa95 100644 --- a/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/Vector2Variable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Vector2 variable type. diff --git a/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs b/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs index e721ab79..16c5511a 100644 --- a/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs +++ b/Assets/Fungus/Scripts/VariableTypes/Vector3Variable.cs @@ -4,7 +4,7 @@ using UnityEngine; using System.Collections; -namespace Fungus.Variables +namespace Fungus { /// /// Vector3 variable type. diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt index cd16b192..1a9535ef 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt @@ -1,37 +1,36 @@ { "registerTypes" : [ - "Fungus.Variables.AnimatorVariable", - "Fungus.Variables.AudioSourceVariable", + "Fungus.AnimatorVariable", + "Fungus.AudioSourceVariable", "Fungus.Block", - "Fungus.Variables.BooleanVariable", + "Fungus.BooleanVariable", "Fungus.Character", - "Fungus.Variables.ColorVariable", + "Fungus.ColorVariable", "Fungus.Command", "Fungus.CommandInfoAttribute", "Fungus.FacingDirection", - "Fungus.Variables.FloatVariable", + "Fungus.FloatVariable", "Fungus.Flowchart", "Fungus.FungusPrefs", "Fungus.LuaEnvironment", "Fungus.LuaUtils", - "Fungus.Variables.GameObjectVariable", - "Fungus.Variables.IntegerVariable", - "Fungus.Commands.Label", - "Fungus.Variables.MaterialVariable", + "Fungus.GameObjectVariable", + "Fungus.IntegerVariable", + "Fungus.MaterialVariable", "Fungus.MenuDialog", - "Fungus.Variables.ObjectVariable", + "Fungus.ObjectVariable", "Fungus.PODTypeFactory", - "Fungus.Utils.PortraitState", + "Fungus.PortraitState", "Fungus.SayDialog", - "Fungus.Variables.SpriteVariable", - "Fungus.Variables.StringVariable", + "Fungus.SpriteVariable", + "Fungus.StringVariable", "Fungus.Task", - "Fungus.Variables.TextureVariable", - "Fungus.Variables.TransformVariable", + "Fungus.TextureVariable", + "Fungus.TransformVariable", "Fungus.Variable", - "Fungus.Variables.Vector2Variable", - "Fungus.Variables.Vector3Variable", - "Fungus.Commands.Label" + "Fungus.Vector2Variable", + "Fungus.Vector3Variable", + "Fungus.Label" ], "extensionTypes" : [ ] diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs index 37b83c1d..ec66ba92 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs @@ -9,7 +9,6 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using MoonSharp.Interpreter; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Tests/Scripting/TestInvoke.cs b/Assets/Tests/Scripting/TestInvoke.cs index a20a69ee..1292d99e 100644 --- a/Assets/Tests/Scripting/TestInvoke.cs +++ b/Assets/Tests/Scripting/TestInvoke.cs @@ -2,7 +2,6 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Variables; namespace Fungus { diff --git a/Assets/Tests/Signals/BlockSignalsTester.cs b/Assets/Tests/Signals/BlockSignalsTester.cs index 1cd0fdce..75ebd39b 100644 --- a/Assets/Tests/Signals/BlockSignalsTester.cs +++ b/Assets/Tests/Signals/BlockSignalsTester.cs @@ -3,7 +3,6 @@ using UnityEngine; using System.Collections; -using Fungus.Commands; namespace Fungus { diff --git a/Assets/Tests/Signals/WriterSignalsTester.cs b/Assets/Tests/Signals/WriterSignalsTester.cs index 5a940a6f..43826683 100644 --- a/Assets/Tests/Signals/WriterSignalsTester.cs +++ b/Assets/Tests/Signals/WriterSignalsTester.cs @@ -2,7 +2,6 @@ // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) using UnityEngine; -using Fungus.Utils; namespace Fungus { diff --git a/Assets/Tests/UI/Editor/TextTagParserTests.cs b/Assets/Tests/UI/Editor/TextTagParserTests.cs index 2e56c821..ed677ba1 100644 --- a/Assets/Tests/UI/Editor/TextTagParserTests.cs +++ b/Assets/Tests/UI/Editor/TextTagParserTests.cs @@ -3,13 +3,11 @@ using System.Collections.Generic; using Fungus; -using Fungus.Utils; #if UNITY_5_3_OR_NEWER using NUnit.Framework; - [TestFixture] public class TextTagParserTests { diff --git a/Assets/Tests/UI/TextTests.unity b/Assets/Tests/UI/TextTests.unity index 66577683..f341ce00 100644 --- a/Assets/Tests/UI/TextTests.unity +++ b/Assets/Tests/UI/TextTests.unity @@ -787,7 +787,7 @@ MonoBehaviour: height: 859 selectedBlock: {fileID: 332004788} selectedCommands: - - {fileID: 332004787} + - {fileID: 332004791} variables: [] description: stepPause: 0 @@ -910,26 +910,9 @@ MonoBehaviour: Culture=neutral, PublicKeyToken=null targetComponentFullname: UnityEngine.Component[] targetComponentText: WriterAudio - targetMethod: SetAudioMode - targetMethodText: 'SetAudioMode (AudioMode): Void' - methodParameters: - - objValue: - typeAssemblyname: Fungus.WriterAudio+AudioMode, Assembly-CSharp, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null - typeFullname: Fungus.WriterAudio+AudioMode - intValue: 1 - boolValue: 0 - floatValue: 0 - stringValue: - colorValue: {r: 0, g: 0, b: 0, a: 0} - gameObjectValue: {fileID: 0} - materialValue: {fileID: 0} - objectValue: {fileID: 0} - spriteValue: {fileID: 0} - textureValue: {fileID: 0} - vector2Value: {x: 0, y: 0} - vector3Value: {x: 0, y: 0, z: 0} - variableKey: + targetMethod: OnInput + targetMethodText: 'OnInput (): Void' + methodParameters: [] saveReturnValue: 0 returnValueVariableKey: returnValueType: System.Void @@ -950,8 +933,8 @@ MonoBehaviour: indentLevel: 0 _duration: floatRef: {fileID: 0} - floatVal: 1 - durationOLD: 2 + floatVal: 2 + durationOLD: 0 --- !u!1 &352621261 GameObject: m_ObjectHideFlags: 0 @@ -5277,7 +5260,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 957032117} + selectedFlowchart: {fileID: 332004786} --- !u!4 &1308535842 Transform: m_ObjectHideFlags: 1