Browse Source

Added missing copyright headers, tidied up enums

master
Christopher 8 years ago
parent
commit
4207ef5d55
  1. 16
      Assets/Fungus/Scripts/Commands/Call.cs
  2. 5
      Assets/Fungus/Scripts/Components/SelectOnEnable.cs
  3. 9
      Assets/Fungus/Scripts/Components/Variable.cs
  4. 12
      Assets/Fungus/Scripts/Components/WriterAudio.cs
  5. 4
      Assets/Fungus/Scripts/Interfaces/IBlock.cs
  6. 5
      Assets/Fungus/Scripts/Interfaces/ICameraController.cs
  7. 6
      Assets/Fungus/Scripts/Interfaces/ICharacter.cs
  8. 5
      Assets/Fungus/Scripts/Interfaces/IClickable2D.cs
  9. 5
      Assets/Fungus/Scripts/Interfaces/ICommand.cs
  10. 4
      Assets/Fungus/Scripts/Interfaces/IConversationManager.cs
  11. 5
      Assets/Fungus/Scripts/Interfaces/ICustomTag.cs
  12. 5
      Assets/Fungus/Scripts/Interfaces/IDialogInput.cs
  13. 4
      Assets/Fungus/Scripts/Interfaces/IDraggable2D.cs
  14. 3
      Assets/Fungus/Scripts/Interfaces/IEventHandler.cs
  15. 6
      Assets/Fungus/Scripts/Interfaces/IFlowchart.cs
  16. 5
      Assets/Fungus/Scripts/Interfaces/ILocalization.cs
  17. 5
      Assets/Fungus/Scripts/Interfaces/IMenuDialog.cs
  18. 5
      Assets/Fungus/Scripts/Interfaces/IMusicController.cs
  19. 4
      Assets/Fungus/Scripts/Interfaces/IPortraitController.cs
  20. 5
      Assets/Fungus/Scripts/Interfaces/ISayDialog.cs
  21. 5
      Assets/Fungus/Scripts/Interfaces/IStage.cs
  22. 5
      Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs
  23. 4
      Assets/Fungus/Scripts/Interfaces/IUpdateable.cs
  24. 12
      Assets/Fungus/Scripts/Interfaces/IVariable.cs
  25. 6
      Assets/Fungus/Scripts/Interfaces/IView.cs
  26. 5
      Assets/Fungus/Scripts/Interfaces/IWriter.cs
  27. 5
      Assets/Fungus/Scripts/Utils/ConversationManager.cs
  28. 5
      Assets/Fungus/Scripts/Utils/FungusConstants.cs
  29. 5
      Assets/Fungus/Scripts/Utils/PortraitUtils.cs
  30. 5
      Assets/Fungus/Scripts/Utils/TextTagToken.cs

16
Assets/Fungus/Scripts/Commands/Call.cs

@ -16,7 +16,14 @@ namespace Fungus
"Execute another block in the same Flowchart as the command, or in a different Flowchart.")]
[AddComponentMenu("")]
public class Call : Command
{
{
public enum CallMode
{
Stop, // Stop executing the current block after calling
Continue, // Continue executing the current block after calling
WaitUntilFinished // Wait until the called block finishes executing, then continue executing current block
}
[Tooltip("Flowchart which contains the block to execute. If none is specified then the current Flowchart is used.")]
[SerializeField] protected Flowchart targetFlowchart;
@ -28,13 +35,6 @@ namespace Fungus
[FormerlySerializedAs("commandIndex")]
[SerializeField] protected int startIndex;
public enum CallMode
{
Stop, // Stop executing the current block after calling
Continue, // Continue executing the current block after calling
WaitUntilFinished // Wait until the called block finishes executing, then continue executing current block
}
[Tooltip("Select if the calling block should stop or continue executing commands, or wait until the called block finishes.")]
[SerializeField] protected CallMode callMode;

5
Assets/Fungus/Scripts/Components/SelectOnEnable.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using UnityEngine.UI;
namespace Fungus

9
Assets/Fungus/Scripts/Components/Variable.cs

@ -6,15 +6,6 @@ using System;
namespace Fungus
{
/// <summary>
/// Scope types for Variables.
/// </summary>
public enum VariableScope
{
Private,
Public
}
/// <summary>
/// Attribute class for variables.
/// </summary>

12
Assets/Fungus/Scripts/Components/WriterAudio.cs

@ -11,6 +11,12 @@ namespace Fungus
/// </summary>
public class WriterAudio : MonoBehaviour, IWriterListener
{
public enum AudioMode
{
Beeps, // Use short beep sound effects
SoundEffect, // Use long looping sound effect
}
[Tooltip("Volume level of writing sound effects")]
[Range(0,1)]
[SerializeField] protected float volume = 1f;
@ -22,12 +28,6 @@ namespace Fungus
[Tooltip("AudioSource to use for playing sound effects. If none is selected then one will be created.")]
[SerializeField] protected AudioSource targetAudioSource;
public enum AudioMode
{
Beeps, // Use short beep sound effects
SoundEffect, // Use long looping sound effect
}
[Tooltip("Type of sound effect to play when writing text")]
[SerializeField] protected AudioMode audioMode = AudioMode.Beeps;

4
Assets/Fungus/Scripts/Interfaces/IBlock.cs

@ -1,4 +1,6 @@
using UnityEngine;
// 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 System.Collections;
using System.Collections.Generic;

5
Assets/Fungus/Scripts/Interfaces/ICameraController.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
namespace Fungus
{

6
Assets/Fungus/Scripts/Interfaces/ICharacter.cs

@ -1,5 +1,7 @@
using UnityEngine;
using System.Collections;
// 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 UnityEngine;
using System.Collections.Generic;
namespace Fungus

5
Assets/Fungus/Scripts/Interfaces/IClickable2D.cs

@ -1,4 +1,7 @@
namespace Fungus
// 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
{
/// <summary>
/// Detects mouse clicks and touches on a Game Object, and sends an event to all Flowchart event handlers in the scene.

5
Assets/Fungus/Scripts/Interfaces/ICommand.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using System.Collections.Generic;
namespace Fungus

4
Assets/Fungus/Scripts/Interfaces/IConversationManager.cs

@ -1,4 +1,6 @@
using UnityEngine;
// 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 System.Collections;
namespace Fungus

5
Assets/Fungus/Scripts/Interfaces/ICustomTag.cs

@ -1,4 +1,7 @@
namespace Fungus
// 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
{
/// <summary>
/// Create custom tags for use in Say text.

5
Assets/Fungus/Scripts/Interfaces/IDialogInput.cs

@ -1,4 +1,7 @@
namespace Fungus
// 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
{
/// <summary>
/// Input handler for say dialogues.

4
Assets/Fungus/Scripts/Interfaces/IDraggable2D.cs

@ -1,5 +1,5 @@
using UnityEngine;
using System.Collections;
// 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
{

3
Assets/Fungus/Scripts/Interfaces/IEventHandler.cs

@ -1,4 +1,5 @@
using UnityEngine;
// 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
{

6
Assets/Fungus/Scripts/Interfaces/IFlowchart.cs

@ -1,5 +1,7 @@
using UnityEngine;
using System.Collections;
// 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 UnityEngine;
using System.Collections.Generic;
namespace Fungus

5
Assets/Fungus/Scripts/Interfaces/ILocalization.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
namespace Fungus
{

5
Assets/Fungus/Scripts/Interfaces/IMenuDialog.cs

@ -1,4 +1,7 @@
using UnityEngine.UI;
// 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 UnityEngine.UI;
using MoonSharp.Interpreter;
using System.Collections;

5
Assets/Fungus/Scripts/Interfaces/IMusicController.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
namespace Fungus
{

4
Assets/Fungus/Scripts/Interfaces/IPortraitController.cs

@ -1,4 +1,6 @@
using UnityEngine;
// 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 MoonSharp.Interpreter;
namespace Fungus

5
Assets/Fungus/Scripts/Interfaces/ISayDialog.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using System.Collections;
namespace Fungus

5
Assets/Fungus/Scripts/Interfaces/IStage.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using UnityEngine.UI;
using System.Collections.Generic;

5
Assets/Fungus/Scripts/Interfaces/ITextTagParser.cs

@ -1,5 +1,6 @@
using UnityEngine;
using System.Collections;
// 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 System.Collections.Generic;
namespace Fungus

4
Assets/Fungus/Scripts/Interfaces/IUpdateable.cs

@ -1,5 +1,5 @@
using UnityEngine;
using System.Collections;
// 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
{

12
Assets/Fungus/Scripts/Interfaces/IVariable.cs

@ -1,7 +1,17 @@
using UnityEngine;
// 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
{
/// <summary>
/// Scope types for Variables.
/// </summary>
public enum VariableScope
{
Private,
Public
}
/// <summary>
/// A Fungus variable that can be used with Commands.
/// </summary>

6
Assets/Fungus/Scripts/Interfaces/IView.cs

@ -1,5 +1,7 @@
using UnityEngine;
using System.Collections;
// 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 UnityEngine;
namespace Fungus
{

5
Assets/Fungus/Scripts/Interfaces/IWriter.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using System.Collections;
namespace Fungus

5
Assets/Fungus/Scripts/Utils/ConversationManager.cs

@ -1,4 +1,7 @@
using System.Collections;
// 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 System.Collections;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using UnityEngine;

5
Assets/Fungus/Scripts/Utils/FungusConstants.cs

@ -1,4 +1,7 @@
namespace Fungus
// 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
{
/// <summary>
/// Global constants used in various parts of Fungus.

5
Assets/Fungus/Scripts/Utils/PortraitUtils.cs

@ -1,4 +1,7 @@
using UnityEngine;
// 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 UnityEngine;
using UnityEngine.UI;
using MoonSharp.Interpreter;

5
Assets/Fungus/Scripts/Utils/TextTagToken.cs

@ -1,4 +1,7 @@
using System.Collections.Generic;
// 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 System.Collections.Generic;
namespace Fungus
{

Loading…
Cancel
Save