diff --git a/CHANGELOG.md b/CHANGELOG.md index bcba9e3..0602c89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.2.4] 2024-04-17 +* fix #46 - The Create Yarn Project menu item was not working in 4.1.2 +* fix #45 - Add `#nullable disable` to the plugin's C# source files for compatibility with projects with nullable enabled +* fix #35 - Don't have the example OptionView expand vertically + ## [0.2.3] 2024-04-03 * Make LineView compatible with any subclass of BaseButton used as your continueButton. #40 by @fmoo * Add GlobalClass attribute to InMemoryVariableStorage, TexTLineProvider, LineView, OptionsListView. #41 by @fmoo diff --git a/Samples/PausingTypewriter/PauseResponder.cs b/Samples/PausingTypewriter/PauseResponder.cs index 2aa825a..b234bee 100644 --- a/Samples/PausingTypewriter/PauseResponder.cs +++ b/Samples/PausingTypewriter/PauseResponder.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using YarnSpinnerGodot; diff --git a/Samples/ReturnOnComplete.cs b/Samples/ReturnOnComplete.cs index 54d6c2a..ff50dfe 100644 --- a/Samples/ReturnOnComplete.cs +++ b/Samples/ReturnOnComplete.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using YarnSpinnerGodot; diff --git a/Samples/SampleEntryPoint.cs b/Samples/SampleEntryPoint.cs index 5954970..8e27bfd 100644 --- a/Samples/SampleEntryPoint.cs +++ b/Samples/SampleEntryPoint.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using System.Collections.Generic; diff --git a/Samples/Space/DialogueTarget.cs b/Samples/Space/DialogueTarget.cs index ec63e3f..6a35119 100644 --- a/Samples/Space/DialogueTarget.cs +++ b/Samples/Space/DialogueTarget.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using System; namespace Samples.Space diff --git a/Samples/Space/Player.cs b/Samples/Space/Player.cs index 7c9ca2d..f302979 100644 --- a/Samples/Space/Player.cs +++ b/Samples/Space/Player.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using Godot.Collections; using YarnSpinnerGodot; diff --git a/Samples/Space/Scripts/SpaceSample.cs b/Samples/Space/Scripts/SpaceSample.cs index 3e548c6..be37820 100644 --- a/Samples/Space/Scripts/SpaceSample.cs +++ b/Samples/Space/Scripts/SpaceSample.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using YarnSpinnerGodot; public partial class SpaceSample : Node diff --git a/Samples/Space/Scripts/StopButton.cs b/Samples/Space/Scripts/StopButton.cs index dcedd1f..49e4f9b 100644 --- a/Samples/Space/Scripts/StopButton.cs +++ b/Samples/Space/Scripts/StopButton.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using System; using YarnSpinnerGodot; diff --git a/Samples/Space/SpaceCamera.cs b/Samples/Space/SpaceCamera.cs index de4ff82..17920a3 100644 --- a/Samples/Space/SpaceCamera.cs +++ b/Samples/Space/SpaceCamera.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using System; diff --git a/Samples/VisualNovel/Scripts/VisualNovelManager.cs b/Samples/VisualNovel/Scripts/VisualNovelManager.cs index e3a14e8..1fa8ecb 100644 --- a/Samples/VisualNovel/Scripts/VisualNovelManager.cs +++ b/Samples/VisualNovel/Scripts/VisualNovelManager.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; using System; using System.Collections.Generic; diff --git a/YarnSpinner-Godot.csproj b/YarnSpinner-Godot.csproj index 3a8e473..fbe2ab0 100644 --- a/YarnSpinner-Godot.csproj +++ b/YarnSpinner-Godot.csproj @@ -2,14 +2,15 @@ net6.0 true + true + + enable - - - - + + + - \ No newline at end of file diff --git a/addons/YarnSpinner-Godot/Editor/UI/LineEditWithSubmit.cs b/addons/YarnSpinner-Godot/Editor/UI/LineEditWithSubmit.cs index 29fd458..aa7010b 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/LineEditWithSubmit.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/LineEditWithSubmit.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/UI/LocaleDeleteButton.cs b/addons/YarnSpinner-Godot/Editor/UI/LocaleDeleteButton.cs index 81d6b44..0904696 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/LocaleDeleteButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/LocaleDeleteButton.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteAddTagButton.cs b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteAddTagButton.cs index 1d8997c..b770f37 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteAddTagButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteAddTagButton.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; namespace YarnSpinnerGodot.Editor.UI; diff --git a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteColorButton.cs b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteColorButton.cs index 00f336e..09de5b3 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteColorButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteColorButton.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; namespace YarnSpinnerGodot.Editor.UI; diff --git a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteDeleteTagButton.cs b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteDeleteTagButton.cs index 7675990..72be4f9 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteDeleteTagButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteDeleteTagButton.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; namespace YarnSpinnerGodot.Editor.UI; diff --git a/addons/YarnSpinner-Godot/Editor/UI/SourcePatternAddButton.cs b/addons/YarnSpinner-Godot/Editor/UI/SourcePatternAddButton.cs index adfc9ca..8c67965 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/SourcePatternAddButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/SourcePatternAddButton.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System.Linq; using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/UI/SourcePatternDeleteButton.cs b/addons/YarnSpinner-Godot/Editor/UI/SourcePatternDeleteButton.cs index 10d2ba0..9946943 100644 --- a/addons/YarnSpinner-Godot/Editor/UI/SourcePatternDeleteButton.cs +++ b/addons/YarnSpinner-Godot/Editor/UI/SourcePatternDeleteButton.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System.Linq; using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/YarnCompileErrorsPropertyEditor.cs b/addons/YarnSpinner-Godot/Editor/YarnCompileErrorsPropertyEditor.cs index 3d27170..fb196f4 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnCompileErrorsPropertyEditor.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnCompileErrorsPropertyEditor.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using Godot; using Array = Godot.Collections.Array; diff --git a/addons/YarnSpinner-Godot/Editor/YarnEditorUtility.cs b/addons/YarnSpinner-Godot/Editor/YarnEditorUtility.cs index 49ab884..25e1142 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnEditorUtility.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnEditorUtility.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System.Collections.Generic; using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/YarnImporter.cs b/addons/YarnSpinner-Godot/Editor/YarnImporter.cs index e0a38b7..cd62ba1 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnImporter.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnImporter.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System.Security.Cryptography; using System.Text; diff --git a/addons/YarnSpinner-Godot/Editor/YarnMarkupPaletteInspectorPlugin.cs b/addons/YarnSpinner-Godot/Editor/YarnMarkupPaletteInspectorPlugin.cs index 4cfb355..8e50681 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnMarkupPaletteInspectorPlugin.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnMarkupPaletteInspectorPlugin.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System; using Godot; diff --git a/addons/YarnSpinner-Godot/Editor/YarnProjectEditorUtility.cs b/addons/YarnSpinner-Godot/Editor/YarnProjectEditorUtility.cs index ec62dec..9eef53a 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnProjectEditorUtility.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnProjectEditorUtility.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System; using System.Collections; diff --git a/addons/YarnSpinner-Godot/Editor/YarnProjectImporter.cs b/addons/YarnSpinner-Godot/Editor/YarnProjectImporter.cs index 7619e04..04243ea 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnProjectImporter.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnProjectImporter.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System; using System.IO; diff --git a/addons/YarnSpinner-Godot/Editor/YarnProjectInspectorPlugin.cs b/addons/YarnSpinner-Godot/Editor/YarnProjectInspectorPlugin.cs index 8b25ba1..726221c 100644 --- a/addons/YarnSpinner-Godot/Editor/YarnProjectInspectorPlugin.cs +++ b/addons/YarnSpinner-Godot/Editor/YarnProjectInspectorPlugin.cs @@ -1,3 +1,4 @@ +#nullable disable #if TOOLS using System; using System.Collections.Generic; diff --git a/addons/YarnSpinner-Godot/Runtime/AssemblyExtensions.cs b/addons/YarnSpinner-Godot/Runtime/AssemblyExtensions.cs index 7d77232..c11c805 100644 --- a/addons/YarnSpinner-Godot/Runtime/AssemblyExtensions.cs +++ b/addons/YarnSpinner-Godot/Runtime/AssemblyExtensions.cs @@ -23,6 +23,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DEALINGS IN THE SOFTWARE. */ +#nullable disable using System.Collections.Generic; using System.Reflection; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/ActionManager.cs b/addons/YarnSpinner-Godot/Runtime/Commands/ActionManager.cs index aafa427..dcb6406 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/ActionManager.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/ActionManager.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Globalization; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/DefaultActions.cs b/addons/YarnSpinner-Godot/Runtime/Commands/DefaultActions.cs index 8487847..61735eb 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/DefaultActions.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/DefaultActions.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Threading.Tasks; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/DispatchCommand.cs b/addons/YarnSpinner-Godot/Runtime/Commands/DispatchCommand.cs index 09c7815..1d089ee 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/DispatchCommand.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/DispatchCommand.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Reflection; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/YarnActionAttribute.cs b/addons/YarnSpinner-Godot/Runtime/Commands/YarnActionAttribute.cs index b0b95f2..b25e0f6 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/YarnActionAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/YarnActionAttribute.cs @@ -1,4 +1,5 @@ using System; +#nullable disable namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/YarnCommandAttribute.cs b/addons/YarnSpinner-Godot/Runtime/Commands/YarnCommandAttribute.cs index 111b2e8..d4d23fa 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/YarnCommandAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/YarnCommandAttribute.cs @@ -24,6 +24,7 @@ DEALINGS IN THE SOFTWARE. */ +#nullable disable using System.Collections; using System; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/YarnFunctionAttribute.cs b/addons/YarnSpinner-Godot/Runtime/Commands/YarnFunctionAttribute.cs index 0fc1d0c..37151e9 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/YarnFunctionAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/YarnFunctionAttribute.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using Yarn; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/YarnParameterAttribute.cs b/addons/YarnSpinner-Godot/Runtime/Commands/YarnParameterAttribute.cs index 08870cd..999c60f 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/YarnParameterAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/YarnParameterAttribute.cs @@ -1,3 +1,4 @@ +#nullable disable using System; diff --git a/addons/YarnSpinner-Godot/Runtime/Commands/YarnStateInjectorAttribute.cs b/addons/YarnSpinner-Godot/Runtime/Commands/YarnStateInjectorAttribute.cs index c52e40b..c3a95e7 100644 --- a/addons/YarnSpinner-Godot/Runtime/Commands/YarnStateInjectorAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/Commands/YarnStateInjectorAttribute.cs @@ -24,6 +24,7 @@ DEALINGS IN THE SOFTWARE. */ +#nullable disable using System; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/DialogueOption.cs b/addons/YarnSpinner-Godot/Runtime/DialogueOption.cs index 24d3a8d..be7dab4 100644 --- a/addons/YarnSpinner-Godot/Runtime/DialogueOption.cs +++ b/addons/YarnSpinner-Godot/Runtime/DialogueOption.cs @@ -23,6 +23,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DEALINGS IN THE SOFTWARE. */ +#nullable disable namespace YarnSpinnerGodot { diff --git a/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs b/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs index acd1224..35ed975 100644 --- a/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs +++ b/addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs @@ -23,6 +23,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DEALINGS IN THE SOFTWARE. */ +#nullable disable using System.Collections.Generic; using System; diff --git a/addons/YarnSpinner-Godot/Runtime/FunctionInfo.cs b/addons/YarnSpinner-Godot/Runtime/FunctionInfo.cs index 640dbfa..6cce6e8 100644 --- a/addons/YarnSpinner-Godot/Runtime/FunctionInfo.cs +++ b/addons/YarnSpinner-Godot/Runtime/FunctionInfo.cs @@ -1,4 +1,4 @@ -using System; +#nullable disable using Godot; namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Runtime/InMemoryVariableStorage.cs b/addons/YarnSpinner-Godot/Runtime/InMemoryVariableStorage.cs index 252c566..58491e1 100644 --- a/addons/YarnSpinner-Godot/Runtime/InMemoryVariableStorage.cs +++ b/addons/YarnSpinner-Godot/Runtime/InMemoryVariableStorage.cs @@ -24,6 +24,7 @@ DEALINGS IN THE SOFTWARE. */ +#nullable disable using System.Collections; using System.Collections.Generic; diff --git a/addons/YarnSpinner-Godot/Runtime/LanguageAttribute.cs b/addons/YarnSpinner-Godot/Runtime/LanguageAttribute.cs index c9786e5..7335a4c 100644 --- a/addons/YarnSpinner-Godot/Runtime/LanguageAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/LanguageAttribute.cs @@ -1,3 +1,4 @@ +#nullable disable namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Runtime/LineMetadata.cs b/addons/YarnSpinner-Godot/Runtime/LineMetadata.cs index 8dd0839..799ce49 100644 --- a/addons/YarnSpinner-Godot/Runtime/LineMetadata.cs +++ b/addons/YarnSpinner-Godot/Runtime/LineMetadata.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Linq; diff --git a/addons/YarnSpinner-Godot/Runtime/LineMetadataTableEntry.cs b/addons/YarnSpinner-Godot/Runtime/LineMetadataTableEntry.cs index c828ff4..072aa93 100644 --- a/addons/YarnSpinner-Godot/Runtime/LineMetadataTableEntry.cs +++ b/addons/YarnSpinner-Godot/Runtime/LineMetadataTableEntry.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using CsvHelper; using System.Collections.Generic; diff --git a/addons/YarnSpinner-Godot/Runtime/LineProviders/LineProviderBehaviour.cs b/addons/YarnSpinner-Godot/Runtime/LineProviders/LineProviderBehaviour.cs index c7287d4..eaa5c61 100644 --- a/addons/YarnSpinner-Godot/Runtime/LineProviders/LineProviderBehaviour.cs +++ b/addons/YarnSpinner-Godot/Runtime/LineProviders/LineProviderBehaviour.cs @@ -1,3 +1,4 @@ +#nullable disable using System.Collections.Generic; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/LineProviders/LocalizedLine.cs b/addons/YarnSpinner-Godot/Runtime/LineProviders/LocalizedLine.cs index 279462e..8b7a058 100644 --- a/addons/YarnSpinner-Godot/Runtime/LineProviders/LocalizedLine.cs +++ b/addons/YarnSpinner-Godot/Runtime/LineProviders/LocalizedLine.cs @@ -1,4 +1,5 @@ -using Godot; +#nullable disable +using Godot; namespace YarnSpinnerGodot; diff --git a/addons/YarnSpinner-Godot/Runtime/LineProviders/TextLineProvider.cs b/addons/YarnSpinner-Godot/Runtime/LineProviders/TextLineProvider.cs index 70a2885..f90f83b 100644 --- a/addons/YarnSpinner-Godot/Runtime/LineProviders/TextLineProvider.cs +++ b/addons/YarnSpinner-Godot/Runtime/LineProviders/TextLineProvider.cs @@ -1,3 +1,4 @@ +#nullable disable using System.Collections.Generic; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Localization.cs b/addons/YarnSpinner-Godot/Runtime/Localization.cs index 8fe3ad7..55b80e5 100644 --- a/addons/YarnSpinner-Godot/Runtime/Localization.cs +++ b/addons/YarnSpinner-Godot/Runtime/Localization.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Linq; diff --git a/addons/YarnSpinner-Godot/Runtime/MarkupAttribute.cs b/addons/YarnSpinner-Godot/Runtime/MarkupAttribute.cs index 300ab97..8227161 100644 --- a/addons/YarnSpinner-Godot/Runtime/MarkupAttribute.cs +++ b/addons/YarnSpinner-Godot/Runtime/MarkupAttribute.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Text; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Option.cs b/addons/YarnSpinner-Godot/Runtime/Option.cs index bf48909..3866f1d 100644 --- a/addons/YarnSpinner-Godot/Runtime/Option.cs +++ b/addons/YarnSpinner-Godot/Runtime/Option.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using Godot; using Yarn; diff --git a/addons/YarnSpinner-Godot/Runtime/SerializedDeclaration.cs b/addons/YarnSpinner-Godot/Runtime/SerializedDeclaration.cs index 9da45af..7c2c822 100644 --- a/addons/YarnSpinner-Godot/Runtime/SerializedDeclaration.cs +++ b/addons/YarnSpinner-Godot/Runtime/SerializedDeclaration.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/StringInfo.cs b/addons/YarnSpinner-Godot/Runtime/StringInfo.cs index 5d903a6..327e86e 100644 --- a/addons/YarnSpinner-Godot/Runtime/StringInfo.cs +++ b/addons/YarnSpinner-Godot/Runtime/StringInfo.cs @@ -1,3 +1,4 @@ +#nullable disable using Godot; public partial class StringInfo : Resource { diff --git a/addons/YarnSpinner-Godot/Runtime/StringTableEntry.cs b/addons/YarnSpinner-Godot/Runtime/StringTableEntry.cs index 9106926..9083c7a 100644 --- a/addons/YarnSpinner-Godot/Runtime/StringTableEntry.cs +++ b/addons/YarnSpinner-Godot/Runtime/StringTableEntry.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using CsvHelper; diff --git a/addons/YarnSpinner-Godot/Runtime/VariableStorageBehaviour.cs b/addons/YarnSpinner-Godot/Runtime/VariableStorageBehaviour.cs index 8434a0c..6736ce1 100644 --- a/addons/YarnSpinner-Godot/Runtime/VariableStorageBehaviour.cs +++ b/addons/YarnSpinner-Godot/Runtime/VariableStorageBehaviour.cs @@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE. */ +#nullable disable using Yarn; namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Runtime/Views/DialogueViewBase.cs b/addons/YarnSpinner-Godot/Runtime/Views/DialogueViewBase.cs index 223124a..78a61ea 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/DialogueViewBase.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/DialogueViewBase.cs @@ -1,3 +1,4 @@ +#nullable disable using System; namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Runtime/Views/Effects.cs b/addons/YarnSpinner-Godot/Runtime/Views/Effects.cs index f765232..6348f00 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/Effects.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/Effects.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/addons/YarnSpinner-Godot/Runtime/Views/LineView.cs b/addons/YarnSpinner-Godot/Runtime/Views/LineView.cs index b642649..cc19016 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/LineView.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/LineView.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Text.RegularExpressions; diff --git a/addons/YarnSpinner-Godot/Runtime/Views/MarkupPalette.cs b/addons/YarnSpinner-Godot/Runtime/Views/MarkupPalette.cs index 8cbe6ea..f402918 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/MarkupPalette.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/MarkupPalette.cs @@ -1,3 +1,4 @@ +#nullable disable using System.Collections; using System.Collections.Generic; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs b/addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs index 35c5b5e..3161369 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using Godot; diff --git a/addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs b/addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs index 58039ad..5ee79a4 100644 --- a/addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs +++ b/addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/addons/YarnSpinner-Godot/Runtime/YarnProject.cs b/addons/YarnSpinner-Godot/Runtime/YarnProject.cs index c9640eb..2db100a 100644 --- a/addons/YarnSpinner-Godot/Runtime/YarnProject.cs +++ b/addons/YarnSpinner-Godot/Runtime/YarnProject.cs @@ -1,3 +1,5 @@ +#nullable disable + using System; using System.Collections.Generic; using System.Globalization; diff --git a/addons/YarnSpinner-Godot/Runtime/YarnProjectError.cs b/addons/YarnSpinner-Godot/Runtime/YarnProjectError.cs index 27fe7a4..8b87a2a 100644 --- a/addons/YarnSpinner-Godot/Runtime/YarnProjectError.cs +++ b/addons/YarnSpinner-Godot/Runtime/YarnProjectError.cs @@ -1,3 +1,4 @@ +#nullable disable using System; using Godot; namespace YarnSpinnerGodot diff --git a/addons/YarnSpinner-Godot/Scenes/OptionView.tscn b/addons/YarnSpinner-Godot/Scenes/OptionView.tscn index 1374aa4..803e81f 100644 --- a/addons/YarnSpinner-Godot/Scenes/OptionView.tscn +++ b/addons/YarnSpinner-Godot/Scenes/OptionView.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" path="res://addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs" id="1"] [node name="OptionView" type="Button" node_paths=PackedStringArray("label")] +custom_minimum_size = Vector2(0, 32) anchors_preset = 7 anchor_left = 0.5 anchor_top = 1.0 @@ -13,7 +14,6 @@ offset_top = -142.0 offset_right = 119.0 offset_bottom = -42.0 size_flags_horizontal = 3 -size_flags_vertical = 3 theme_override_font_sizes/font_size = 36 script = ExtResource("1") label = NodePath("VBoxContainer/RichTextLabel") diff --git a/addons/YarnSpinner-Godot/YarnSpinnerPlugin.cs b/addons/YarnSpinner-Godot/YarnSpinnerPlugin.cs index d82b224..177a6e2 100644 --- a/addons/YarnSpinner-Godot/YarnSpinnerPlugin.cs +++ b/addons/YarnSpinner-Godot/YarnSpinnerPlugin.cs @@ -1,4 +1,5 @@ #if TOOLS +#nullable disable using System; using System.Collections.Generic; using System.Linq; @@ -229,7 +230,7 @@ private void ShowCreateFilePopup(string filter, string windowTitle, dialog.PopupCentered(new Vector2I(700, 500)); } - private static void CreateYarnProjectDestinationSelected(string destination) + private void CreateYarnProjectDestinationSelected(string destination) { GD.Print("Creating a yarn project at " + destination); YarnEditorUtility.CreateYarnProject(destination);