Merge branch 'versions/2.5'

docs/about/team.md

@@ -10,7 +10,7 @@ description: Learn about the glorious history of Yarn Spinner.
 
 Yarn Spinner Pty. Ltd. was founded by the team that created Yarn Spinner—Jon Manning, Tim Nugent, and Paris Buttfield-Addison—all colleagues and contributors at Secret Lab, a game development studio, known for working on Night in the Woods, the Australian ABC Play School games, and more.
 
-Yarn Spinner is now maintained by the Yarn Spinner Pty. Ltd. team: [Jon Manning](https://twitter.com/desplesda), [Tim Nugent](https://twitter.com/the\_mcjones), and [Paris Buttfield-Addison](https://twitter.com/parisba), with regular help from researcher and freelancer [Mars Buttfield-Addison](https://twitter.com/themartianlife), and a huge community of open source contributors. ❤️
+Yarn Spinner is now maintained by the Yarn Spinner Pty. Ltd. team: [Jon Manning](https://twitter.com/desplesda), [Tim Nugent](https://twitter.com/the_mcjones), and [Paris Buttfield-Addison](https://twitter.com/parisba), with regular help from researcher and freelancer [Mars Buttfield-Addison](https://twitter.com/themartianlife), and a huge community of open source contributors. ❤️
 
 You can [support Yarn Spinner on Patreon](http://patreon.com/secretlab).
 
@@ -21,7 +21,9 @@ You can [support Yarn Spinner on Patreon](http://patreon.com/secretlab).
 * **v2.0** was released in December 2021;
 * **v2.1** was released in February 2022;
 * **v2.2** was released in April 2022;
-* **v2.3** was released in July 2023.
+* **v2.3** was released in July 2023;
+* **v2.4** was released in November 2023;
+* **v2.5** was released in December 2024, this will be the final significant release of the 2.x version, before we move to 3.x.
 
 ## About Yarn Spinner Pty. Ltd.
 

docs/add-ons/about-add-ons.md

@@ -25,10 +25,14 @@ At the moment, these include:
 * [Dialogue Wheel for Yarn Spinner](dialogue-wheel/)
 * [Speech Bubbles for Yarn Spinner](speech-bubbles/)
 
-You can purchase both of these on the Yarn Spinner Itch.io Store:
+You can purchase both of these on the [Yarn Spinner Itch.io Store](https://yarnspinner.itch.io), or via [the Unity Asset Store](https://assetstore.unity.com/publishers/91946):
 
 {% embed url="https://yarnspinner.itch.io/" %}
-Purchase Yarn Spinner for Unity, plus our Add-ons, on Itch.io
+Purchase Yarn Spinner for Unity, plus our Add-ons, on Itch.io.
+{% endembed %}
+
+{% embed url="https://assetstore.unity.com/publishers/91946" %}
+Purchase Yarn Spinner for Unity, plus our Add-ons, on the Unity Asset Store.
 {% endembed %}
 
 This section of the Yarn Spinner documentation provides guides for the available add-ons.

docs/api/csharp/SUMMARY.md

@@ -486,19 +486,21 @@
       * [Line](docs/api/csharp/yarn.compiler.position.line.md)
     * [Project](docs/api/csharp/yarn.compiler.project.md)
       * [CurrentProjectFileVersion](docs/api/csharp/yarn.compiler.project.currentprojectfileversion.md)
+      * [WorkspaceRootPlaceholder](docs/api/csharp/yarn.compiler.project.workspacerootplaceholder.md)
       * [YarnSpinnerProjectVersion2](docs/api/csharp/yarn.compiler.project.yarnspinnerprojectversion2.md)
       * [YarnSpinnerProjectVersion3](docs/api/csharp/yarn.compiler.project.yarnspinnerprojectversion3.md)
       * [Project\(\)](docs/api/csharp/yarn.compiler.project..ctor-1.md)
-      * [Project\(string\)](docs/api/csharp/yarn.compiler.project..ctor-2.md)
+      * [Project\(string,string?\)](docs/api/csharp/yarn.compiler.project..ctor-2.md)
       * [GetJson\(\)](docs/api/csharp/yarn.compiler.project.getjson.md)
       * [IsMatchingPath\(string\)](docs/api/csharp/yarn.compiler.project.ismatchingpath.md)
       * [IsValidVersionNumber\(int\)](docs/api/csharp/yarn.compiler.project.isvalidversionnumber.md)
-      * [LoadFromFile\(string\)](docs/api/csharp/yarn.compiler.project.loadfromfile.md)
+      * [LoadFromFile\(string,string?\)](docs/api/csharp/yarn.compiler.project.loadfromfile.md)
       * [SaveToFile\(string\)](docs/api/csharp/yarn.compiler.project.savetofile.md)
       * [AllowLanguagePreviewFeatures](docs/api/csharp/yarn.compiler.project.allowlanguagepreviewfeatures.md)
       * [BaseLanguage](docs/api/csharp/yarn.compiler.project.baselanguage.md)
       * [CompilerOptions](docs/api/csharp/yarn.compiler.project.compileroptions.md)
       * [Definitions](docs/api/csharp/yarn.compiler.project.definitions.md)
+      * [DefinitionsFiles](docs/api/csharp/yarn.compiler.project.definitionsfiles.md)
       * [DefinitionsPath](docs/api/csharp/yarn.compiler.project.definitionspath.md)
       * [ExcludeFilePatterns](docs/api/csharp/yarn.compiler.project.excludefilepatterns.md)
       * [ExtensionData](docs/api/csharp/yarn.compiler.project.extensiondata.md)
@@ -507,6 +509,7 @@
       * [Path](docs/api/csharp/yarn.compiler.project.path.md)
       * [SourceFilePatterns](docs/api/csharp/yarn.compiler.project.sourcefilepatterns.md)
       * [SourceFiles](docs/api/csharp/yarn.compiler.project.sourcefiles.md)
+      * [WorkspaceRootPath](docs/api/csharp/yarn.compiler.project.workspacerootpath.md)
       * [LocalizationInfo](docs/api/csharp/yarn.compiler.project.localizationinfo.md)
         * [Assets](docs/api/csharp/yarn.compiler.project.localizationinfo.assets.md)
         * [Strings](docs/api/csharp/yarn.compiler.project.localizationinfo.strings.md)
@@ -740,6 +743,7 @@
       * [GetCulture\(string\)](docs/api/csharp/yarn.unity.cultures.getculture.md)
       * [GetCultures\(\)](docs/api/csharp/yarn.unity.cultures.getcultures.md)
       * [HasCulture\(string\)](docs/api/csharp/yarn.unity.cultures.hasculture.md)
+      * [TryGetCulture\(string,Culture\)](docs/api/csharp/yarn.unity.cultures.trygetculture.md)
       * [CurrentNeutralCulture](docs/api/csharp/yarn.unity.cultures.currentneutralculture.md)
     * [DialogueAdvanceInput](docs/api/csharp/yarn.unity.dialogueadvanceinput.md)
       * [continueAction](docs/api/csharp/yarn.unity.dialogueadvanceinput.continueaction.md)
@@ -910,6 +914,23 @@
       * [LocaleCode](docs/api/csharp/yarn.unity.lineproviderbehaviour.localecode.md)
       * [YarnProject](docs/api/csharp/yarn.unity.lineproviderbehaviour.yarnproject.md)
     * [LineView](docs/api/csharp/yarn.unity.lineview.md)
+      * [autoAdvance](docs/api/csharp/yarn.unity.lineview.autoadvance.md)
+      * [canvasGroup](docs/api/csharp/yarn.unity.lineview.canvasgroup.md)
+      * [characterNameContainer](docs/api/csharp/yarn.unity.lineview.characternamecontainer.md)
+      * [characterNameText](docs/api/csharp/yarn.unity.lineview.characternametext.md)
+      * [continueButton](docs/api/csharp/yarn.unity.lineview.continuebutton.md)
+      * [fadeInTime](docs/api/csharp/yarn.unity.lineview.fadeintime.md)
+      * [fadeOutTime](docs/api/csharp/yarn.unity.lineview.fadeouttime.md)
+      * [holdTime](docs/api/csharp/yarn.unity.lineview.holdtime.md)
+      * [lineText](docs/api/csharp/yarn.unity.lineview.linetext.md)
+      * [onCharacterTyped](docs/api/csharp/yarn.unity.lineview.oncharactertyped.md)
+      * [onPauseEnded](docs/api/csharp/yarn.unity.lineview.onpauseended.md)
+      * [onPauseStarted](docs/api/csharp/yarn.unity.lineview.onpausestarted.md)
+      * [palette](docs/api/csharp/yarn.unity.lineview.palette.md)
+      * [showCharacterNameInLineView](docs/api/csharp/yarn.unity.lineview.showcharacternameinlineview.md)
+      * [typewriterEffectSpeed](docs/api/csharp/yarn.unity.lineview.typewritereffectspeed.md)
+      * [useFadeEffect](docs/api/csharp/yarn.unity.lineview.usefadeeffect.md)
+      * [useTypewriterEffect](docs/api/csharp/yarn.unity.lineview.usetypewritereffect.md)
       * [AddLineBreaks\(Markup.MarkupParseResult\)](docs/api/csharp/yarn.unity.lineview.addlinebreaks.md)
       * [DialogueComplete\(\)](docs/api/csharp/yarn.unity.lineview.dialoguecomplete.md)
       * [DismissLine\(Action\)](docs/api/csharp/yarn.unity.lineview.dismissline.md)
@@ -1186,14 +1207,6 @@
       * [SetStateMachine\(IAsyncStateMachine\)](docs/api/csharp/yarn.unity.yarntaskmethodbuilder.setstatemachine-2.md)
       * [Start\(TStateMachine\)](docs/api/csharp/yarn.unity.yarntaskmethodbuilder.start-2.md)
       * [Task](docs/api/csharp/yarn.unity.yarntaskmethodbuilder.task-2.md)
-  * [Yarn.Unity.Editor Namespace](docs/api/csharp/yarn.unity.editor.md)
-    * [SerializableDictionaryPropertyDrawer](docs/api/csharp/yarn.unity.editor.serializabledictionarypropertydrawer.md)
-      * [GetPropertyHeight\(SerializedProperty,GUIContent\)](docs/api/csharp/yarn.unity.editor.serializabledictionarypropertydrawer.getpropertyheight.md)
-      * [GetPropertyValue\(SerializedProperty\)](docs/api/csharp/yarn.unity.editor.serializabledictionarypropertydrawer.getpropertyvalue.md)
-      * [OnGUI\(Rect,SerializedProperty,GUIContent\)](docs/api/csharp/yarn.unity.editor.serializabledictionarypropertydrawer.ongui.md)
-    * [SerializableDictionaryStoragePropertyDrawer](docs/api/csharp/yarn.unity.editor.serializabledictionarystoragepropertydrawer.md)
-      * [GetPropertyHeight\(SerializedProperty,GUIContent\)](docs/api/csharp/yarn.unity.editor.serializabledictionarystoragepropertydrawer.getpropertyheight.md)
-      * [OnGUI\(Rect,SerializedProperty,GUIContent\)](docs/api/csharp/yarn.unity.editor.serializabledictionarystoragepropertydrawer.ongui.md)
   * [Yarn.Unity.UnityLocalization Namespace](docs/api/csharp/yarn.unity.unitylocalization.md)
     * [LineMetadata](docs/api/csharp/yarn.unity.unitylocalization.linemetadata.md)
       * [nodeName](docs/api/csharp/yarn.unity.unitylocalization.linemetadata.nodename.md)