Commit Graph

54 Commits

Author SHA1 Message Date
Thomas Sarkanen
50f74cb068 Proper fix for Blackboard context menu
Reverted workaround in FUIComandList.
Properly appended command lists in BT editor so keyboard shortcut routing and context menus all work together.

TTP# 340628 - BINARY: EDITOR: Unable to rename/delete blackboard keys with right click menu

[CL 2180008 by Thomas Sarkanen in Main branch]
2014-07-09 04:10:37 -04:00
Thomas Sarkanen
8605c6353f Delete and rename Blackboard keys now work again from right-click menu
Added the ability to check for command registration (as this can crash if a command is registed more than once) and re-used the asset editor toolkit command list when registering commands.

TTP# 340628 - BINARY: EDITOR: Unable to rename/delete blackboard keys with right click menu

[CL 2170051 by Thomas Sarkanen in Main branch]
2014-07-07 11:26:26 -04:00
Lukasz Furman
aa9e2c3102 behavior tree restart on value/result change in blackboard decorator
[CL 2124338 by Lukasz Furman in Main branch]
2014-07-02 08:02:36 -04:00
Thomas Sarkanen
8768e7923b Managing and creating Blackboard asset improvements
Added factory for Blackboard assets so they can have their own entry & icon in the context menu.
Added toolbar shortcut to create a new Blackboard asset alongside the BT.
Fixed selecting new Blackboard sometimes not displaying in Blackboard mode.
Displayed root node properties when nothing is selected so blackboard assets can be chosen.
Also added missing icons for small toolbars

TTP# 339961 - [Editor][AI] There's no way to create a blackboard asset
TTP# 339731 - Editor: Behaviour Tree: Root node UI improvements

reviewed by Lukasz.Furman

[CL 2119281 by Thomas Sarkanen in Main branch]
2014-06-27 06:25:31 -04:00
Thomas Sarkanen
a279557d28 Dont block graph connections in behavior trees, replace existing instead
Reworked connection logic in the behavior tree graph schema.
Found that while the code to check while dragging/hovering was switched when dropping interms of pin direction. This made denying connections in directed graphs (like BTs) problematic. Fixed this by just reversing the pin order on drop, tested in Blueprint & it seems to be working fine.
Also fixed creating graph cycles, which caused a crash.

TTP# 339732 - Editor: Behaviour Tree: Dragging link should replace existing, not be blocked

reviewed by Lukasz.Furman

[CL 2119237 by Thomas Sarkanen in Main branch]
2014-06-27 05:35:20 -04:00
Thomas Sarkanen
6065f0f7d6 Behavior Tree nodes are now categorized
Added new BlueprintCategory property to UBlueprints that propagates to class metadata on Blueprint compilation. This metadata is then used for C++ and Blueprint-based node classes when displayed in the behavior tree palette.
Also fixed blueprint decorators incorrectly displaying no icon.

TTP# 337865 - [EDITOR][BT editor] BT nodes could use a way to define custom categories

reviewed by Lukasz.Furman

[CL 2117859 by Thomas Sarkanen in Main branch]
2014-06-26 08:16:03 -04:00
Thomas Sarkanen
4ef14c1da5 Prevented behavior tree nodes from going pink after undo
Made sure node owner is up-to-date after undo. This fixes the outer of the node being incorrect post-undo. Nodes are renamed away non-transactionally when deleted and cleaned up, so the change to the outer gets ignored and is not restored normally. This ensures that it gets properly fixed up.

TTP# 339299 - UE4: BEHAVIORTREE: Node turns pink from Undoing a delete

reviewed by Lukasz.Furman

[CL 2117819 by Thomas Sarkanen in Main branch]
2014-06-26 06:15:25 -04:00
Thomas Sarkanen
7cf728a440 Fixed crash when deleting then attempting to rename blackboard key
Made sure the details panel gets a refresh on delete.

TTP# 339846 - CRITICAL: DATA ASSET: CRASH: Occurs after deleting and modifying the name of a key

[CL 2117763 by Thomas Sarkanen in Main branch]
2014-06-26 05:00:00 -04:00
Michael Noland
8e21e38390 Editor: Add UFactory::CanCreateNew and make bCreateNew a protected member
[CL 2117678 by Michael Noland in Main branch]
2014-06-26 02:59:25 -04:00
Matt Kuhlenschmidt
6387890456 Fix children of struct properties in the blueprint editor not always passing visibility tests
- Refactored IsPropertyVisible delegate to pass in a parent property pointer so complex visibility tests with struct parents can be performed

[CL 2115458 by Matt Kuhlenschmidt in Main branch]
2014-06-24 13:07:20 -04:00
Steve Robb
cd27f589b6 Some static analysis fixes.
From here: https://udn.unrealengine.com/questions/210807/static-code-analysis.html

#fix Redundant comparison of RootEdNode removed.
#fix Incorrect operator used to test FPropertyTable::SelectionUnit flags.
#fix Missing comparison used for testing FSlateColor::ColorUseRule

#codereview robert.manuszewski,matt.kuhlenschmidt,nick.atamas

[CL 2115454 by Steve Robb in Main branch]
2014-06-24 13:06:53 -04:00
Michael Schoell
788de6f349 Removed GetNodeNativeTitle from the editor entirely, now uses BuildSourceString to obtain the source string in a more reliable way.
#codereview Justin.Sargent

[CL 2114371 by Michael Schoell in Main branch]
2014-06-23 15:36:50 -04:00
Thomas Sarkanen
e596ed6e50 CIS fix - non-unity.
[CL 2113910 by Thomas Sarkanen in Main branch]
2014-06-23 10:22:34 -04:00
Thomas Sarkanen
515f9ae61b Behavior Tree root nodes now have correct tooltip
Root nodes do not initialize their class data member (as they are never placed, only generated) which is to generate the default tooltip. Overriding the function to provide a useful tooltip for nodes.

TTP# 339280 - UE4: BEHAVIORTREE: Class not found tooltop still appears after saving

[CL 2113880 by Thomas Sarkanen in Main branch]
2014-06-23 07:17:10 -04:00
Thomas Sarkanen
dbb244f1af CIS fix - missing changes.
[CL 2113878 by Thomas Sarkanen in Main branch]
2014-06-23 07:12:24 -04:00
Thomas Sarkanen
701af666fc Added new node buttons to behavior tree editor.
Added 3 new buttons/combo buttons used to create new Blueprint-based node classes. Buttons turn into combo buttons if there is more than one type of base class available.
New class Blueprints are created alongside the current behavior tree asset.
Fixed toolbar buttons having no visibility control if they had no bound command list.

TTP# 337671 - Behavior Tree Editor: Extend toolbar with ôcreate new taskö, ôcreate new decoratorö, ôcreate new serviceö options

reviewed by Andrew.Brown, Lukasz.Furman

[CL 2113857 by Thomas Sarkanen in Main branch]
2014-06-23 06:27:16 -04:00
Thomas Sarkanen
694424c3c6 Added improved blackboard editor & replaced simple blackboard debug view.
Added new blackboard view based on MyBlueprint.
Class viewer can now optionally display "Display Names" for classes (this is used to make the names of blackboard entries more friendly).
SPropertyEditorEditInline now displays the class type icon as well as its name.
Blackboard entry details customization now hides the header for entries, so one level of expansion is no longer necessary.
Removed pointer to 'view' in the blackboard debugger & replaced with delegates where appropriate.
Fixed crash issue also mentioned here: https://github.com/EpicGames/UnrealEngine/pull/212
Added new detail customization used to display only the selected entry in the current blackboard.
Fixed crash when running services with no Blackboard (prevent access of NULL blackboard component).

TTP# 337669 - Behaviour Tree Editor: Integrate Blackboard debugging display with Blackboard Editor

reviewed by Andrew.Brown, Lukasz.Furman

[CL 2113798 by Thomas Sarkanen in Main branch]
2014-06-23 04:26:26 -04:00
Thomas Sarkanen
4ebfbcf379 Fixed crash opening a new behavior tree
Debugger now checks for a valid graph before dereferencing it. We may not have initialized the graph before the debugger is set up, so we lazy-initialize the root node pointer.

TTP# 338513 - CRITICAL: Regression: BEHAVIOR TREES: CRASH: When opening

reviewed by Andrew.Rodham, Max.Preussner

[CL 2108979 by Thomas Sarkanen in Main branch]
2014-06-18 04:04:45 -04:00
Lukasz Furman
9fd584522b compilation fix
[CL 2104532 by Lukasz Furman in Main branch]
2014-06-13 09:54:33 -04:00
Lukasz Furman
4676430988 fixed hitch on loading all classes/packages for behavior tree editor
[CL 2104462 by Lukasz Furman in Main branch]
2014-06-13 08:19:03 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Thomas Sarkanen
866ed146db Hooked up new Behavior Tree icons.
Added editor-only functions to allow nodes to override their in-editor icon display.
Added Blueprint icon to show which nodes use Blueprint for their logic.
Hooked up new icons to Editor style.
Added missing Blackboard icon.

TTP# 337682 - [ART REQUEST] New Icons for behaviour trees

reviewed by Andrew.Brown, Lukasz.Furman

[CL 2103111 by Thomas Sarkanen in Main branch]
2014-06-12 09:29:05 -04:00
Thomas Sarkanen
7e1af5583a Fixed non-unity CIS.
[CL 2103089 by Thomas Sarkanen in Main branch]
2014-06-12 08:58:56 -04:00
Thomas Sarkanen
c21e3cbc7f Blackboards are now edited within the Behavior Tree Editor.
Tweaked and reworked the BT editor to allow for multiple modes (like the Blueprint Editor).
If a behavior tree uses a Blackboard, that blackboard is editable in the same asset editor, under "Blackboard mode".
Fixed a number of issues with re-focussing the BT debugger (and some issues that arose when switching BT editor modes). Debugging info should now be properly displayed when selecting AIs, switching modes, starting up the BT editor while playing etc.
Fixed a breakpoint bug where debug pause would be toggled rather than enabled, causing the game to run for a short time.
Added new icons for BT & BB modes.
Added various new guards against nullptr dereferences.
Displayed Actor label rather than FName when choosing actors to debug.

TTP# 337108 - Behaviour Tree Editor: Integrate Blackboard Editor into Behaviour Tree Editor

reviewed by Chris.Wood, Lukasz.Furman

[CL 2102883 by Thomas Sarkanen in Main branch]
2014-06-12 04:02:48 -04:00
sebastian kowalczyk
11f70e150d Fixed differen issues for GameplayDebugger and fixed missing features we had before moving to separate module.
[CL 2101734 by sebastian kowalczyk in Main branch]
2014-06-11 09:13:09 -04:00