Merge branch 'feature/documentation' into develop

ashblue · ashblue · commit 3497dc3f6cdb · 2018-08-31T12:34:42.000-06:00
diff --git a/Assets/FluidBehaviorTree/Scripts/BehaviorTree/BehaviorTreeBuilderBase.cs b/Assets/FluidBehaviorTree/Scripts/BehaviorTree/BehaviorTreeBuilderBase.cs
@@ -130,6 +130,12 @@ public T Wait (int turns = 1) {
             return Wait("wait", turns);
         }
 
+        public T Splice (BehaviorTree tree) {
+            _tree.Splice(Pointer, tree);
+
+            return (T)this;
+        }
+
         public T End () {
             _pointer.RemoveAt(_pointer.Count - 1);
             
diff --git a/Assets/FluidBehaviorTree/Scripts/Tasks/TaskBase.cs b/Assets/FluidBehaviorTree/Scripts/Tasks/TaskBase.cs
@@ -78,7 +78,7 @@ private void Init () {
         }
 
         /// <summary>
-        /// Run the first time this node is run or after a hard reset
+        /// Triggers the first time this node is run or after a hard reset
         /// </summary>
         protected virtual void OnInit () {
         }
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
@@ -1,21 +1,22 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!159 &1
-EditorSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 7
-  m_ExternalVersionControlSupport: Visible Meta Files
-  m_SerializationMode: 2
-  m_LineEndingsForNewScripts: 2
-  m_DefaultBehaviorMode: 0
-  m_SpritePackerMode: 0
-  m_SpritePackerPaddingPower: 1
-  m_EtcTextureCompressorBehavior: 1
-  m_EtcTextureFastCompressor: 1
-  m_EtcTextureNormalCompressor: 2
-  m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
-  m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
-  m_CollabEditorSettings:
-    inProgressEnabled: 1
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!159 &1
+EditorSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 7
+  m_ExternalVersionControlSupport: Visible Meta Files
+  m_SerializationMode: 2
+  m_LineEndingsForNewScripts: 2
+  m_DefaultBehaviorMode: 0
+  m_SpritePackerMode: 0
+  m_SpritePackerPaddingPower: 1
+  m_EtcTextureCompressorBehavior: 1
+  m_EtcTextureFastCompressor: 1
+  m_EtcTextureNormalCompressor: 2
+  m_EtcTextureBestCompressor: 4
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef
+  m_ProjectGenerationRootNamespace: 
+  m_UserGeneratedProjectSuffix: 
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
+  m_EnableTextureStreamingInPlayMode: 1
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.2.0f2
+m_EditorVersion: 2018.2.6f1
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private void Init () {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/// <summary>`
`81`		`- /// Run the first time this node is run or after a hard reset`
	`81`	`+ /// Triggers the first time this node is run or after a hard reset`
`82`	`82`	`/// </summary>`
`83`	`83`	`protected virtual void OnInit () {`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-m_EditorVersion: 2018.2.0f2`
	`1`	`+m_EditorVersion: 2018.2.6f1`