Commit Graph

34 Commits

Author SHA1 Message Date
maxime mercier
c0ec2b7948 Flatten instanced struct hierarchy
#jira none
#rnx
#preflight 61b39f0d180f781e43397899

#ROBOMERGE-AUTHOR: maxime.mercier
#ROBOMERGE-SOURCE: CL 18432399 in //UE5/Release-5.0/... via CL 18435405
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18435896 by maxime mercier in ue5-release-engine-test branch]
2021-12-10 18:06:46 -05:00
mikko mononen
defa3321a1 StateTree CIS fix
#jira none
trivial

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18418163 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v897-18405271)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18418191 by mikko mononen in ue5-release-engine-test branch]
2021-12-09 08:32:07 -05:00
mikko mononen
cfabe1b4e1 StateTree: control flow evaluators
- added base class for common evaluators
- added cooldown guard
- added selection guard

#jira none
#preflight 61b1d4b6764790bee6ade85a

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18417343 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v897-18405271)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18417348 by mikko mononen in ue5-release-engine-test branch]
2021-12-09 05:40:14 -05:00
mikko mononen
472bd7dfc8 StateTree improvements:
- EnterState() stops on failure, ExitState() handled symmetrically up to the last failed task
- Allow to run evaluators when reselecting a state after failed EnterState()

#jira none
#preflight 61b1d3e2274068529fddcafe

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18417260 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v897-18405271)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18417297 by mikko mononen in ue5-release-engine-test branch]
2021-12-09 05:27:27 -05:00
mikko mononen
c866e28ab8 StateTree: allow schema to configure editor
- allow to disable enter conditions and evaluators
- allow to configure state to have just one task

#jira UE-135723
#preflight 61b067d35c61dba07bef0718

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18403954 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v896-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18403964 by mikko mononen in ue5-release-engine-test branch]
2021-12-08 03:32:02 -05:00
mark lintott
4718cadfa5 Fix for Static Analisys Warnings
#rb trivial
#jira none
#preflight 61acb115832ebaf948859b99

#ROBOMERGE-AUTHOR: mark.lintott
#ROBOMERGE-SOURCE: CL 18378206 in //UE5/Release-5.0/... via CL 18378220
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18378225 by mark lintott in ue5-release-engine-test branch]
2021-12-05 07:40:47 -05:00
jon nabozny
0d5fc99c2a Prevent MassAI and StateTree from crashing when invalid StateTree assets are used.
Added a check to make usre StateTrees have valid instances, and prevented adding Mass Behavior subsystems when an ExecutionContext fails to initialize.

[FYI] [at]Julien.Marchand, [at]Mikko.Mononen
#jira UE-134972, UE-134977

#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 18192097 via CL 18372150 via CL 18372271
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18372327 by jon nabozny in ue5-release-engine-test branch]
2021-12-03 15:35:57 -05:00
mark lintott
2e931a7335 More Non-Unity fixes..
#rb none
#jira none
#preflight 61a796441d2787d839607373

#ROBOMERGE-AUTHOR: mark.lintott
#ROBOMERGE-SOURCE: CL 18339559 in //UE5/Release-5.0/... via CL 18339565
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18339570 by mark lintott in ue5-release-engine-test branch]
2021-12-01 10:50:36 -05:00
mikko mononen
1b7df471de StateTree: Gameplay Tag conditions
#jira UE-135723
#preflight 61a7355d8015016c7e1e6236

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18337003 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18337026 by mikko mononen in ue5-release-engine-test branch]
2021-12-01 04:11:56 -05:00
mikko mononen
f0ccef43ca StateTree UI improvements
- fixed description display on BP conditions
- added class cache that contains also BP classes and is kept up to date as the assets and BPs change
- the condition/evaluator/task selector now shows struct and class based items in same menu
- added meta = (Hidden) support for structs to prevent them displaying in the item selector

#jira UE-135723
#preflight 61a7302e9c77d6100788c8ad

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18336889 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18336898 by mikko mononen in ue5-release-engine-test branch]
2021-12-01 03:42:52 -05:00
mikko mononen
dd996bb30c StateTree tweaks
- removed pure virtuals from StateTree nodes
- cosmetic change when StateTree current state is set

#jira none
#preflight 61a5e27e801b36197842b262

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18322563 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18322567 by mikko mononen in ue5-release-engine-test branch]
2021-11-30 03:54:16 -05:00
mikko mononen
fb782a2bcf StateTree: fixed class filter in StateTree bindable item bindings
#jira none
#rb [at]yoan.stamant
#preflight 61a47f72361aa0b85b17f52b

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18306756 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18306767 by mikko mononen in ue5-release-engine-test branch]
2021-11-29 02:46:15 -05:00
mikko mononen
f2cea5939a StateTree:unity build fix.
#jira none
#preflight 619f382288439fccfeb37a4d

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18292787 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18292800 by mikko mononen in ue5-release-engine-test branch]
2021-11-25 02:39:31 -05:00
ben marsh
9fc8b6704c Fix NoPCH build errors.
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 18283954 in //UE5/Release-5.0/... via CL 18283966
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18283986 by ben marsh in ue5-release-engine-test branch]
2021-11-24 10:31:56 -05:00
mikko mononen
11ea4b3fa0 StateTree: UObject and BP support
- connect GetWorld() of FStateTreeExecutionContext explicitly to the owner
- take MassSignalSubsystem as parameter to FMassStateTreeExecutionContext directly
- separated DataViewIndex (what others see) and InstanceIndex/bInstanceIsObject (where the pointert comes from) on StateTree items
- allow item instance to be a struct or object
- added editor support for both struct or object based instance
- added Blueprint base classes for Eval, Task and Condition
- Update UStateTreeBrainComponent

#jira UE-135723

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18280804 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18280809 by mikko mononen in ue5-release-engine-test branch]
2021-11-24 04:26:29 -05:00
mikko mononen
1340d0453e StateTree: Fixed tests to reflect recent changes in state selection
#jira none
[REVIEW]
#preflight 619b5458fa0b360c4062d5cf

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18259645 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18259656 by mikko mononen in ue5-release-engine-test branch]
2021-11-22 12:12:10 -05:00
yoan stamant
c7ec639091 [StateTree] fixed bad inheritance of a struct used for tests and added trait WithPureVirtual for FStateTreeConditionBase struct
#jira UE-134964
#rb maxime.mercier
#preflight 6196c9a1b30daab4cb8dfffb

#ROBOMERGE-AUTHOR: yoan.stamant
#ROBOMERGE-SOURCE: CL 18245237 in //UE5/Release-5.0/... via CL 18245243
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 18245251 by yoan stamant in ue5-release-engine-test branch]
2021-11-18 17:22:17 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
yoan stamant
360d5f7438 [StateTreeTest] Provide world as outer when creating test StateTrees to allow VLOG without ensure
#rb maxime.mercier
#preflight 61957fc3f802365f87d9707c

#ROBOMERGE-AUTHOR: yoan.stamant
#ROBOMERGE-SOURCE: CL 18230772 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18230826 by yoan stamant in ue5-release-engine-test branch]
2021-11-17 18:08:53 -05:00
yoan stamant
b57d577409 [StateTree] fixed clang compiler CIS issues caused by exported templates
#rb maxime.mercier
[FYI] mikko.mononen
#jira UE-134926

#ROBOMERGE-AUTHOR: yoan.stamant
#ROBOMERGE-SOURCE: CL 18190932 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18191021 by yoan stamant in ue5-release-engine-test branch]
2021-11-15 10:58:48 -05:00
mikko mononen
4f7ae55361 StateTree: handle transitions after ticking tasks and evaluators
- changed at which stage transitions are handled
- updated the binding visibility of tasks and evaluators (transition conditions can see task data now)

#jira none
[REVIEW]
#preflight 619217e6e96ba28321d9e72e

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18183493 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18183500 by mikko mononen in ue5-release-engine-test branch]
2021-11-15 03:46:57 -05:00
mikko mononen
24de01248c StateTree: allow task/evaluator/condition to have separate data for isntance and item in the tree.
- Changed conditions to use the same code structure as tasks and evals
- Tasks, Evaluators, and Conditions can have separate struct for instance and tree item
- Converted existing tasks/evals/conds to use the new setup
- Updated the UI to use the new setup
- Limited the property binding to only first level properties in the instance struct
- Removed StateTreeConditionItemDetails (uses the same details customization as tasks/evals)
- Removed bunch of old test tasks and evals

#jira UE-133870
#rb Yoan.StAmant

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18165353 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18165377 by mikko mononen in ue5-release-engine-test branch]
2021-11-12 05:49:31 -05:00
yoan stamant
7aefe60674 Misc type conversion warning trivial fixes
#rb maxime.mercier
#preflight 618aa174cd591b516590f10c

#ROBOMERGE-AUTHOR: yoan.stamant
#ROBOMERGE-SOURCE: CL 18107621 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18107630 by yoan stamant in ue5-release-engine-test branch]
2021-11-09 12:24:26 -05:00
mikko mononen
9e2cc0194e StateTree: Fixed validation crash in GetExternalItem()
#jira none
#rb Mieszko.Zielinski

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18083196 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18083230 by mikko mononen in ue5-release-engine-test branch]
2021-11-08 06:40:19 -05:00
mikko mononen
8bb7c1edaf StateTree: calculate external item indices correctly
#jira none

#ROBOMERGE-AUTHOR: mikko.mononen
#ROBOMERGE-SOURCE: CL 18031381 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v885-17909292)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 18031432 by mikko mononen in ue5-release-engine-test branch]
2021-11-03 07:03:18 -04:00