Commit Graph

48 Commits

Author SHA1 Message Date
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
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
steven dao
b70a3f2efd Add new Actions (Actor/Component/Element) menu to the level editor's main menu bar that brings up the context menu corresponding to the selection
- The menu's title changes depending on the selection ("Actor", "Component", or "Element" currently since those are the three currently-defined context menus for the level editor)
- The context menus will get reorganized in subsequent changes so that the pulldown Actions menu displays the full set of entries while the right-click context menu is trimmed down to a shorter subset of entries. This change does not reorganize any items yet.
- Add support to UToolMenus for using a TAttribute<FText> for the pulldown menu title/tooltip and for supplying FOnGetContent for generating the pulldown menu.

#rb rex.hill
#preflight 61534e89260f7d0001c7e4ac

#ROBOMERGE-OWNER: steven.dao
#ROBOMERGE-AUTHOR: steven.dao
#ROBOMERGE-SOURCE: CL 17652268 via CL 17652271 via CL 17652276 via CL 17652280 via CL 17652287
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v875-17642767)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17652461 by steven dao in ue5-release-engine-test branch]
2021-09-28 17:41:11 -04:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -04:00
zousar shaker
836bd0854d Automated search-and-replace pass to change uses of UE_TRANSITIONAL_OBJECT_PTR(Type) to TObjectPtr<Type>.
There were two instance of the type being incorrect and they were manually fixed.

#rb none

#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 17472048 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17472069 by zousar shaker in ue5-release-engine-test branch]
2021-09-09 10:07:44 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
lauren barnes
a46b2299ef Adding one more missing conditional
#jira UE-116859
#rb trivial

#ROBOMERGE-SOURCE: CL 16790799 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16790800 by lauren barnes in ue5-release-engine-test branch]
2021-06-25 21:24:35 -04:00
lauren barnes
bddd513ae2 Adding conditionals and logging to find main menu crashes on Mac
#jira UE-116859
#rb Brooke.Hubert
[FYI] Jerome.Delattre
#preflight 60d616e3d326d90001b8ee3e

#ROBOMERGE-SOURCE: CL 16787563 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16787607 by lauren barnes in ue5-release-engine-test branch]
2021-06-25 15:32:30 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
zach rammell
6cf95ac628 Make tool menu context class finder forward found class type to BP return type
#rb rex.hill brooke.hubert jamie.dale
#preflight 60c932ef43ec3800010c81da

#ROBOMERGE-SOURCE: CL 16689996 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16690014 by zach rammell in ue5-release-engine-test branch]
2021-06-16 11:57:04 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
jamie dale
9db3723503 Added menu context clean-up functions
These are called when a menu is closed, and can be used to clean-up context object data without needing to run a GC

#rb Rex.Hill

#ROBOMERGE-SOURCE: CL 15562929 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15562993 by jamie dale in ue5-main branch]
2021-03-01 18:20:08 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
Lauren Barnes
94aa16c5ac Adding command handling for FToolUIActions. There is now an in-viewport property menu that can be enabled by Editor.EnableInViewportMenu in the console, and then pressing Tab when a supported actor (currently any light actor) is selected.
#rb Rex.Hill
#jira UETOOL-2698

[CL 15036864 by Lauren Barnes in ue5-main branch]
2021-01-11 09:19:43 -04:00
Zousar Shaker
fc2ad21a5e Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrades in Engine + Shootergame

#rb devin.doucette

[CL 14996467 by Zousar Shaker in ue5-main branch]
2021-01-05 19:16:25 -04:00
Matt Kuhlenschmidt
6973e6a61e Toolbars can now support a hybrid mode where they include no text unless a specific toolbar entry is called out using the "calloutstyle" for the toolbar entry. This allows toolbars to reduce their width significantly. The level editor now uses this by default but a few other asset editors have been set up for this
[CL 14994802 by Matt Kuhlenschmidt in ue5-main branch]
2021-01-05 16:38:18 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
rex hill
2b510f6d5c Fix for level editor viewport menu commands not working after changing layout.
#jira UE-92684
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 13181439 via CL 13184224 via CL 13184258 via CL 13184288 via CL 13184350
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13184404 by rex hill in Main branch]
2020-05-05 14:40:45 -04:00
rex hill
3bbb19423f Submenus now have the option to collapse when only one item
#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 13048125 via CL 13048166 via CL 13049109 via CL 13049172 via CL 13049314
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13049385 by rex hill in Main branch]
2020-04-27 14:12:24 -04:00
rex hill
f6ece06d33 Disabled menu customization via config file as long as it conflicts with runtime menu customization
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 12975262 via CL 12975393 via CL 12975411 via CL 12975426
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12975458 by rex hill in Main branch]
2020-04-22 11:42:56 -04:00
rex hill
dfc0cd938a Fix being able to select game mode pawn classes when it should be blocked.
#jira UE-86129
#rb ben.zeigler

#ROBOMERGE-SOURCE: CL 12869563 via CL 12872061 via CL 12872085 via CL 12872101
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12872122 by rex hill in Main branch]
2020-04-16 16:05:15 -04:00
matt kuhlenschmidt
793758b90b Fixed not being able to add separators to toolbars using the new tool menus api to create toolbars. Toolbars were not accounting for multiple separator types. Deprecated the concept of a menu separator and a toolbar separator and made only one separator type.
For now did not deprecate usage of AddMenuSeparator in menu builders due to the extreme number of fiiles this touches

[CODEREVIEW] rex.hill

#ROBOMERGE-SOURCE: CL 12669820 via CL 12669822 via CL 12669823
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12671630 by matt kuhlenschmidt in Main branch]
2020-04-08 10:05:51 -04:00
matt kuhlenschmidt
8efe981495 Fix tool menus not supporting styles
[CODEREVIEW] rex.hill


#ROBOMERGE-SOURCE: CL 12129751 via CL 12133496
#ROBOMERGE-BOT: (v659-12123632)

[CL 12133692 by matt kuhlenschmidt in Main branch]
2020-03-11 13:10:46 -04:00