Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge revamp of behaviour tree #21

Open
wants to merge 88 commits into
base: develop
Choose a base branch
from
Open

Merge revamp of behaviour tree #21

wants to merge 88 commits into from

Conversation

David624634
Copy link
Contributor

@David624634 David624634 commented Jun 17, 2024 •
edited
Loading

This pull request incorporates the work from #5.

Fixed multiple issues of the old behaviour tree implementation

  • Fixed bug not allowing builds
  • Fixed connections not being removable in the editor
  • Fixed bug in random nodes not working correctly
  • Fixed various spelling mistakes

Enhancements:

  • Complete visual overall of the tree editor window (colors, manual)
  • Added auto layout button for trees
  • Added descriptions to tasks in the tree
  • Added visual representations of the task state of a tree in the editor
  • Added Undo/Redo operations
  • Extended options for new and existing tasks in the editor
  • Added sample scenes
  • Added additional checks to catch user errors and offer explanations
  • Added more ways of opening tree in the editor (double-clicking, from the scene hierarchy)
  • Added documentation
  • Added automatic test

This pull request requires #18 to be merged first, otherwise links to the documentation will not work.

@SebastianMeinberger
Added missing support for decorator nodes
e66adb8
@SebastianMeinberger
Added base classes for decorator and composite nodes
0e662fc
@SebastianMeinberger
Added option to reset task, in order to execute them again
cf0efe5
@SebastianMeinberger
Added the decorator node RepeatUntilSucess
aadffa1
@SebastianMeinberger
Adapted var to naming convention
225b28e
@SebastianMeinberger
Decorator base class now sets agent
92ad993
@SebastianMeinberger
Composite base class now sets agent
9150d01
@SebastianMeinberger
Navmesh agent is now not deactivated, instead isStopped attribute is …
3ca3b5f 
…used
@SebastianMeinberger
Added inverter node, that ivert return state from child
a066e3b
@SebastianMeinberger
Added wait for proximity task
65f7520
@SebastianMeinberger
Added second agent to display same tree on multiple agents
1ae6b45
@SebastianMeinberger
Light refactors (comments, renames and structure)
c84de7e
@SebastianMeinberger
Added comments
90b63f3
@SebastianMeinberger
Added node that executes one of its child tasks at random
8940644
@SebastianMeinberger
Moved handling of executing agent and child list initlising into the …
d62b756 
…corresponding super classes
@SebastianMeinberger
Added nodde that lets it child fail, if it doesn't finish in a specif…
eb146b2 
…ied time
@SebastianMeinberger
Added support for serializing bools
b98185a
@SebastianMeinberger
Added check tasks that allow to check for conditions in the enviornment
7f668df
@SebastianMeinberger
Obsolete, can be replaced by repeat+checkForProximity nodes
9989ca9
@SebastianMeinberger
Resetting values manually in reset is uneccesarry, can be done in exe…
f3dc8e7 
…cute
@SebastianMeinberger
Resetting a running task now also triggers Stop()
a038c1c
@SebastianMeinberger
RunnerInspector can now properly display serialized bools
e39bd58
@SebastianMeinberger
navMeshAgent has to be set before execute is executed
ff1bf07
@SebastianMeinberger
Sample tree displays the new node types
781f376
@SebastianMeinberger
Higher children are now executed before lower children
51b6150
@SebastianMeinberger
RootNode is now automatically added to every Tree Asset
d1fba78
@SebastianMeinberger
Rootnodes can now neither be deleted nor created
8b5cdcb
@SebastianMeinberger
Root is now only added, if the asset is already saved (otherwise, an …
ff52289 
…exeption is thrown)
@SebastianMeinberger
Added a root node
d3f1ac8
@SebastianMeinberger
Merge branch 'enhancment/behavior_tree_InSceneInspector' into enhancm…
1eaafbd 
…ent/behavior_tree_MoreNodeTypes_merge

# Conflicts:
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/AgentBaseTask.cs
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks.meta
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckBaseTask.cs
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckBaseTask.cs.meta
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckForProximityTask.cs
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckForProximityTask.cs.meta
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckForValidPath.cs
#	Assets/Virtual Agents Framework/Runtime/Scripts/FundamentalAgentTasks/CheckTasks/CheckForValidPath.cs.meta
#	Assets/Virtual Agents Framework/Samples/BehaviorTree/BehavoirTreeSampleScene.unity
#	Assets/Virtual Agents Framework/Samples/BehaviorTree/SampleTree.asset
David624634 added 25 commits May 6, 2024 00:21
@David624634
Added error messages and highlighting for wrongly formatted trees
6b0ff34
@David624634
fixed random node (broke samples)
774c253
@David624634
enhanced pickability of connection points
8d0c6d8
@David624634
renamed behavior to behaviour
c4b3280
@David624634
Serializations of tree nodes now update automatically when new attrib…
41f63e4 
…utes are added
@David624634
Added method to update serialization keys in existing files
1b64b31
@David624634
Added new Tasks and options to Behaviour Tree
fc4cb83
@David624634
Added changeable descriptions to nodes in editor
cbf8e4a
@David624634
Improved in-editor manuel
d5613f3
@David624634
Editor can now switch between task states of multiple agents
a1c533d
@David624634
Inspector for nodes in inspector opens at the top now
f523e8d
@David624634
Added better warnings
539be70
@David624634
fixed task status persisting when playmode is ended
01fc7b2
@David624634
added auto layout button
313722d
@David624634
small fixes
7b34bf9
@David624634
revamped samples
cb7c47e
@David624634
added test scene
e32ace0
@David624634
completed documentation
c426e6b
@David624634
Merge branch 'develop' into merge/behaviorTree
0fc316d
@David624634
added test run for behaviour tree
b49f31a
@David624634
small fixes in example scenes
8c1851e
@David624634
added references to behaviour tree in other parts of the documentation
198e121
@David624634
Added samples to sample list
5058ed9
@David624634
spelling corrections
2c287dc
@David624634
revert breaking spelling correction
a16d11b
@David624634 David624634 marked this pull request as ready for review June 17, 2024 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenediktHensen BenediktHensen Awaiting requested review from BenediktHensen

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@David624634 @SebastianMeinberger @lenalinke