Merge pull request #47 from YarnSpinnerTool/0.2.4

0.2.4

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 

Samples/PausingTypewriter/PauseResponder.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using YarnSpinnerGodot;
 

Samples/ReturnOnComplete.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using YarnSpinnerGodot;
 

Samples/SampleEntryPoint.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using System.Collections.Generic;
 

Samples/Space/DialogueTarget.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using System;
 namespace Samples.Space

Samples/Space/Player.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using Godot.Collections;
 using YarnSpinnerGodot;

Samples/Space/Scripts/SpaceSample.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using YarnSpinnerGodot;
 public partial class SpaceSample : Node

Samples/Space/Scripts/StopButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using System;
 using YarnSpinnerGodot;

Samples/Space/SpaceCamera.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using System;
 

Samples/VisualNovel/Scripts/VisualNovelManager.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 using System;
 using System.Collections.Generic;

YarnSpinner-Godot.csproj

@@ -2,14 +2,15 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
+    <WarningsAsErrors>true</WarningsAsErrors>
+    <!--Turn on Nullable so that we can fail the build if there are any incompatible scripts-->
+    <Nullable>enable</Nullable>
   </PropertyGroup>
-
   <ItemGroup>
     <!-- Add some extra files for ease of developing samples -->
-    <None Include="addons\YarnSpinner-Godot\YarnSpinner-Godot.props"/>
-    <None Include="addons\YarnSpinner-Godot\plugin.cfg"/>
-    <None Include="**\*.md"/>
+    <None Include="addons\YarnSpinner-Godot\YarnSpinner-Godot.props" />
+    <None Include="addons\YarnSpinner-Godot\plugin.cfg" />
+    <None Include="**\*.md" />
   </ItemGroup>
-
   <Import Project="addons\YarnSpinner-Godot\YarnSpinner-Godot.props" />
 </Project>

addons/YarnSpinner-Godot/Editor/UI/LineEditWithSubmit.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using Godot;
 

addons/YarnSpinner-Godot/Editor/UI/LocaleDeleteButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using Godot;
 

addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteAddTagButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 
 namespace YarnSpinnerGodot.Editor.UI;

addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteColorButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 
 namespace YarnSpinnerGodot.Editor.UI;

addons/YarnSpinner-Godot/Editor/UI/MarkupPaletteDeleteTagButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 
 namespace YarnSpinnerGodot.Editor.UI;

addons/YarnSpinner-Godot/Editor/UI/SourcePatternAddButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System.Linq;
 using Godot;

addons/YarnSpinner-Godot/Editor/UI/SourcePatternDeleteButton.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System.Linq;
 using Godot;

addons/YarnSpinner-Godot/Editor/YarnCompileErrorsPropertyEditor.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using Godot;
 using Array = Godot.Collections.Array;

addons/YarnSpinner-Godot/Editor/YarnEditorUtility.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System.Collections.Generic;
 using Godot;

addons/YarnSpinner-Godot/Editor/YarnImporter.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System.Security.Cryptography;
 using System.Text;

addons/YarnSpinner-Godot/Editor/YarnMarkupPaletteInspectorPlugin.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System;
 using Godot;

addons/YarnSpinner-Godot/Editor/YarnProjectEditorUtility.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System;
 using System.Collections;

addons/YarnSpinner-Godot/Editor/YarnProjectImporter.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System;
 using System.IO;

addons/YarnSpinner-Godot/Editor/YarnProjectInspectorPlugin.cs

@@ -1,3 +1,4 @@
+#nullable disable
 #if TOOLS
 using System;
 using System.Collections.Generic;

addons/YarnSpinner-Godot/Runtime/AssemblyExtensions.cs

@@ -23,6 +23,7 @@
 DEALINGS IN THE SOFTWARE.
 
 */
+#nullable disable
 
 using System.Collections.Generic;
 using System.Reflection;

addons/YarnSpinner-Godot/Runtime/Commands/ActionManager.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Globalization;

addons/YarnSpinner-Godot/Runtime/Commands/DefaultActions.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Threading.Tasks;
 using Godot;

addons/YarnSpinner-Godot/Runtime/Commands/DispatchCommand.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Reflection;
 using Godot;

addons/YarnSpinner-Godot/Runtime/Commands/YarnActionAttribute.cs

@@ -1,4 +1,5 @@
 using System;
+#nullable disable
 
 
 namespace YarnSpinnerGodot

addons/YarnSpinner-Godot/Runtime/Commands/YarnCommandAttribute.cs

@@ -24,6 +24,7 @@
 
 */
 
+#nullable disable
 
 using System.Collections;
 using System;

addons/YarnSpinner-Godot/Runtime/Commands/YarnFunctionAttribute.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using Yarn;
 

addons/YarnSpinner-Godot/Runtime/Commands/YarnParameterAttribute.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 
 

addons/YarnSpinner-Godot/Runtime/Commands/YarnStateInjectorAttribute.cs

@@ -24,6 +24,7 @@
 
 */
 
+#nullable disable
 
 using System;
 using Godot;

addons/YarnSpinner-Godot/Runtime/DialogueOption.cs

@@ -23,6 +23,7 @@
 DEALINGS IN THE SOFTWARE.
 
 */
+#nullable disable
 
 namespace YarnSpinnerGodot
 {

addons/YarnSpinner-Godot/Runtime/DialogueRunner.cs

@@ -23,6 +23,7 @@
 DEALINGS IN THE SOFTWARE.
 
 */
+#nullable disable
 
 using System.Collections.Generic;
 using System;

addons/YarnSpinner-Godot/Runtime/FunctionInfo.cs

@@ -1,4 +1,4 @@
-using System;
+#nullable disable
 using Godot;
 
 namespace YarnSpinnerGodot

addons/YarnSpinner-Godot/Runtime/InMemoryVariableStorage.cs

@@ -24,6 +24,7 @@
 
 */
 
+#nullable disable
 
 using System.Collections;
 using System.Collections.Generic;

addons/YarnSpinner-Godot/Runtime/LanguageAttribute.cs

@@ -1,3 +1,4 @@
+#nullable disable
 
 
 namespace YarnSpinnerGodot

addons/YarnSpinner-Godot/Runtime/LineMetadata.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Linq;

addons/YarnSpinner-Godot/Runtime/LineMetadataTableEntry.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using CsvHelper;
 using System.Collections.Generic;

addons/YarnSpinner-Godot/Runtime/LineProviders/LineProviderBehaviour.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System.Collections.Generic;
 using Godot;
 

addons/YarnSpinner-Godot/Runtime/LineProviders/LocalizedLine.cs

@@ -1,4 +1,5 @@
-using Godot;
+#nullable disable
+using Godot;
 
 namespace YarnSpinnerGodot;
 

addons/YarnSpinner-Godot/Runtime/LineProviders/TextLineProvider.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System.Collections.Generic;
 using Godot;
 

addons/YarnSpinner-Godot/Runtime/Localization.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Linq;

addons/YarnSpinner-Godot/Runtime/MarkupAttribute.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Text;
 using Godot;

addons/YarnSpinner-Godot/Runtime/Option.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using Godot;
 using Yarn;

addons/YarnSpinner-Godot/Runtime/SerializedDeclaration.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using Godot;

addons/YarnSpinner-Godot/Runtime/StringInfo.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using Godot;
 public partial class StringInfo : Resource
 {

addons/YarnSpinner-Godot/Runtime/StringTableEntry.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using CsvHelper;

addons/YarnSpinner-Godot/Runtime/VariableStorageBehaviour.cs

@@ -25,6 +25,7 @@
 */
 
 
+#nullable disable
 
 using Yarn;
 namespace YarnSpinnerGodot

addons/YarnSpinner-Godot/Runtime/Views/DialogueViewBase.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 
 namespace YarnSpinnerGodot

addons/YarnSpinner-Godot/Runtime/Views/Effects.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

addons/YarnSpinner-Godot/Runtime/Views/LineView.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;

addons/YarnSpinner-Godot/Runtime/Views/MarkupPalette.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System.Collections;
 using System.Collections.Generic;
 using Godot;

addons/YarnSpinner-Godot/Runtime/Views/OptionView.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using Godot;
 

addons/YarnSpinner-Godot/Runtime/Views/OptionsListView.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

addons/YarnSpinner-Godot/Runtime/YarnProject.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;

addons/YarnSpinner-Godot/Runtime/YarnProjectError.cs

@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using Godot;
 namespace YarnSpinnerGodot

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")

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 CreateYarnProject()
             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);