Merge branch 'develop' into all-contributors/add-call-stack

Author: ashblue

.all-contributorsrc

@@ -5,6 +5,15 @@
   "imageSize": 100,
   "commit": false,
   "contributors": [
+    {
+      "login": "ashblue",
+      "name": "Ash Blue",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/643307?v=4",
+      "profile": "http://blueashes.com",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "JesseTG",
       "name": "Jesse Talavera-Greenberg",
@@ -15,12 +24,21 @@
       ]
     },
     {
-      "login": "ashblue",
-      "name": "Ash Blue",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/643307?v=4",
-      "profile": "http://blueashes.com",
+      "login": "PureSaltProductions",
+      "name": "PureSaltProductions",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/52610924?v=4",
+      "profile": "https://github.com/PureSaltProductions",
       "contributions": [
-        "code"
+        "userTesting"
+      ]
+    },
+    {
+      "login": "mduvergey",
+      "name": "Martin Duvergey",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/18513379?v=4",
+      "profile": "https://github.com/mduvergey",
+      "contributions": [
+        "bug"
       ]
     },
     {

Assets/FluidBehaviorTree/Tests/Editor/Fluid.BehaviorTree.EditorTests.asmdef

@@ -2,24 +2,17 @@
     "name": "Fluid.BehaviorTree.EditorTests",
     "references": [
         "Fluid.BehaviorTree",
-        "Fluid.BehaviorTree.Editor",
-        "UnityEngine.TestRunner",
-        "UnityEditor.TestRunner"
+        "Fluid.BehaviorTree.Editor"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": true,
     "precompiledReferences": [
         "nunit.framework.dll",
         "NSubstitute.dll"
     ],
-    "autoReferenced": false,
-    "defineConstraints": [
-        "UNITY_INCLUDE_TESTS"
-    ],
-    "versionDefines": [],
-    "noEngineReferences": false
-}
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ]
+}

Assets/FluidBehaviorTree/Tests/Editor/Fluid.BehaviorTree.EditorTests.asmdef.meta

@@ -12,13 +12,13 @@
     "clever-crow.nsubstitute": "2.0.3",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "2.0.8",
+    "com.unity.ads": "3.4.5",
     "com.unity.analytics": "3.3.5",
     "com.unity.collab-proxy": "1.2.16",
     "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.1.4",
+    "com.unity.ide.vscode": "1.2.0",
     "com.unity.purchasing": "2.0.6",
-    "com.unity.test-framework": "1.1.9",
+    "com.unity.test-framework": "1.1.14",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.timeline": "1.2.10",
     "com.unity.ugui": "1.0.0",

Packages/manifest.json

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.3.0f6
-m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
+m_EditorVersion: 2019.3.15f1
+m_EditorVersionWithRevision: 2019.3.15f1 (59ff3e03856d)

ProjectSettings/ProjectVersion.txt

@@ -722,8 +722,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://jesse.tg"><img src="https://avatars0.githubusercontent.com/u/1175189?v=4" width="100px;" alt=""/><br /><sub><b>Jesse Talavera-Greenberg</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/commits?author=JesseTG" title="Code">💻</a></td>
     <td align="center"><a href="http://blueashes.com"><img src="https://avatars2.githubusercontent.com/u/643307?v=4" width="100px;" alt=""/><br /><sub><b>Ash Blue</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/commits?author=ashblue" title="Code">💻</a></td>
+    <td align="center"><a href="https://jesse.tg"><img src="https://avatars0.githubusercontent.com/u/1175189?v=4" width="100px;" alt=""/><br /><sub><b>Jesse Talavera-Greenberg</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/commits?author=JesseTG" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/PureSaltProductions"><img src="https://avatars1.githubusercontent.com/u/52610924?v=4" width="100px;" alt=""/><br /><sub><b>PureSaltProductions</b></sub></a><br /><a href="#userTesting-PureSaltProductions" title="User Testing">📓</a></td>
+    <td align="center"><a href="https://github.com/mduvergey"><img src="https://avatars2.githubusercontent.com/u/18513379?v=4" width="100px;" alt=""/><br /><sub><b>Martin Duvergey</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/issues?q=author%3Amduvergey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/call-stack"><img src="https://avatars1.githubusercontent.com/u/38575304?v=4" width="100px;" alt=""/><br /><sub><b>call-stack</b></sub></a><br /><a href="https://github.com/ashblue/fluid-behavior-tree/issues?q=author%3Acall-stack" title="Bug reports">🐛</a></td>
   </tr>
 </table>