Skip to content

Commit 8015af8

Browse files
committed
Merge branch 'release/1.0'
2 parents 89f9200 + 10d195b commit 8015af8

File tree

130 files changed

+4268
-2268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+4268
-2268
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

Assets/FluidBehaviorTree/Editor/Testing/Builders.meta renamed to Assets/FluidBehaviorTree/Editor/Builders.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/Builders/A.cs.meta renamed to Assets/FluidBehaviorTree/Editor/Builders/A.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/Builders/TaskStubBuilder.cs renamed to Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ namespace Adnc.FluidBT.Testing {
66
public class TaskStubBuilder {
77
private bool _enabled = true;
88
private TaskStatus _status = TaskStatus.Success;
9-
private bool _abortConditionSelf;
109

1110
public TaskStubBuilder WithEnabled (bool enabled) {
1211
_enabled = enabled;
@@ -20,23 +19,10 @@ public TaskStubBuilder WithUpdateStatus (TaskStatus status) {
2019
return this;
2120
}
2221

23-
public TaskStubBuilder WithAbortConditionSelf (bool abortCondition) {
24-
_abortConditionSelf = abortCondition;
25-
26-
return this;
27-
}
28-
2922
public ITask Build () {
3023
var task = Substitute.For<ITask>();
3124
task.Enabled.Returns(_enabled);
32-
task.Update().Returns(_status);
33-
task.GetAbortStatus().Returns(i => task.Update());
34-
35-
if (_abortConditionSelf) {
36-
task.GetAbortCondition().Returns(task);
37-
} else {
38-
task.GetAbortCondition().ReturnsNull();
39-
}
25+
task.Update().ReturnsForAnyArgs(_status);
4026

4127
return task;
4228
}

Assets/FluidBehaviorTree/Editor/Testing/Builders/TaskStubBuilder.cs.meta renamed to Assets/FluidBehaviorTree/Editor/Builders/TaskStubBuilder.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using UnityEditor;
4+
5+
namespace Adnc.FluidBT.Editor {
6+
public class ExportProject {
7+
[MenuItem("Export/Fluid Behavior Tree")]
8+
static void BuildProject () {
9+
var core = GetCoreFiles();
10+
var examples = GetExampleFiles();
11+
var path = EditorUtility.OpenFolderPanel("Select Output Location", "", "");
12+
13+
AssetDatabase.ExportPackage(core.ToArray(), $"{path}/Fluid Behavior Tree.unitypackage");
14+
AssetDatabase.ExportPackage(examples.ToArray(), $"{path}/Fluid Behavior Tree - Examples.unitypackage");
15+
}
16+
17+
private static List<string> GetCoreFiles () {
18+
return AssetDatabase
19+
.FindAssets("", new[] {"Assets/FluidBehaviorTree"}).ToList()
20+
.Select(AssetDatabase.GUIDToAssetPath)
21+
.Where(file => {
22+
var invalidFolder = file.Contains("Assets/FluidBehaviorTree/Editor") ||
23+
file.Contains("Assets/FluidBehaviorTree/Examples");
24+
25+
if (invalidFolder) return false;
26+
27+
return !file.Contains("Test.cs");
28+
}).ToList();
29+
}
30+
31+
private static List<string> GetExampleFiles () {
32+
return AssetDatabase
33+
.FindAssets("", new[] {"Assets/FluidBehaviorTree/Examples"}).ToList()
34+
.Select(AssetDatabase.GUIDToAssetPath).ToList();
35+
}
36+
}
37+
}

Assets/FluidBehaviorTree/Editor/ExportProject.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FluidBehaviorTree/Editor/Testing/BehaviorTree/BehaviorTreeTest.cs

Lines changed: 0 additions & 152 deletions
This file was deleted.

Assets/FluidBehaviorTree/Editor/Testing/BehaviorTree/BehaviorTreeTest.cs.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Assets/FluidBehaviorTree/Editor/Testing/Decorators.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Assets/FluidBehaviorTree/Editor/Testing/Decorators/DecoratorTest.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)