Commit Graph

61 Commits

Author SHA1 Message Date
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
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
aditya ravichandran
1bbc93e86a Fixed an issue that prevented the content browser from being dockable and appearing in the Window Menu
#jira UE-126907
#rb matt.uhlenschmidt

#ROBOMERGE-AUTHOR: aditya.ravichandran
#ROBOMERGE-SOURCE: CL 17542764 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17542771 by aditya ravichandran in ue5-release-engine-test branch]
2021-09-16 14:57:07 -04:00
aditya ravichandran
9c09a76984 Reskin the Level Editor Main Toolbar,
Move Editor Modes to a Combo Button,
Combine Content and Create into one dropdown,
Reorder items in the Content Browser add and context menu to be more meaningful
#jira UETOOL-3814
#preflight 61434322599fd8000190b8bf
#rb Louise.Rasmussen, brooke.hubert

#ROBOMERGE-AUTHOR: aditya.ravichandran
#ROBOMERGE-SOURCE: CL 17538574 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17538604 by aditya ravichandran in ue5-release-engine-test branch]
2021-09-16 10:15:01 -04:00
matt kuhlenschmidt
22122a948f Logging and safeguard for docking content browser drawer crash
#jira UE-118098

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

[CL 16691016 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-06-16 13:09:00 -04:00
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
2021-05-11 01:10:20 -04:00
UnrealBot
8afb476248 Branch snapshot for CL 16260158
[CL 16260158 in ue5-release-engine-staging branch]
2021-10-05 20:06:24 +00: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
matt kuhlenschmidt
b728f19f30 Fix browse button doing nothing if a content browser is not docked. It should open the drawer
#rb lauren.barnes
#jira UE-112480
#lockdown simon.tourangeau

#ROBOMERGE-SOURCE: CL 15954112 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)

[CL 15971501 by matt kuhlenschmidt in ue5-main branch]
2021-04-10 10:03:39 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
matt kuhlenschmidt
d43686a0bf UE5 layout changes
Content browser now hidden by default, opening tip is displayed showing you how to access it from the drawer. It can be permanently docked into the layout from there. Opening tip is never shown again
Placement browser is now closed by default
A UE4 classic layout has been added for those who want the placement browser and content browser docked by default

#jira UETOOL-2669

#ROBOMERGE-OWNER: matt.kuhlenschmidt
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 15918688 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15921147 by matt kuhlenschmidt in ue5-main branch]
2021-04-05 15:03:56 -04:00
Mike Zyracki
8a209cfa5b Control Rig: Pose Library. When we add a new new folder to our whitelist it doesn't show up since the path view doesn't refresh. So added API call to ContentBrowserSingleton->PathPicker to refresh/populate the view due to the filter change.
#jira UESEQ-749
#rb rex.hill

[CL 14881757 by Mike Zyracki in ue5-main branch]
2020-12-08 16:14:15 -04:00
Mike Zyracki
423f9a2847 Content Browse Singleton: Add functions to rename assets or folders or add a new folder. This is needed for custom context menus, like one in the new Pose Library, so they can interact correctly with the hidden text edit widgets.
#jira UE-103366
#rb rex.hill

[CL 14838468 by Mike Zyracki in ue5-main branch]
2020-12-02 16:21:54 -04:00
Matt Kuhlenschmidt
97417204f2 Prevent creating assets from creating a new content browser when there is an open content browser drawer.
[CL 14821608 by Matt Kuhlenschmidt in ue5-main branch]
2020-11-30 13:28:01 -04:00
brooke hubert
1d722fa530 Fix cook assert when blutility module loads content browser module.
#rnx
#Jira UE-103012
#rb @matt.peters

[CL 14736774 by brooke hubert in ue5-main branch]
2020-11-12 15:08:11 -04:00
brooke hubert
6b43ed1986 Add a drop down menu to the Content shortcut in the level editor, to which plugins can add additional shortcuts.
#Jira UE-101076
#rb chris.gagnon

[CL 14728018 by brooke hubert in ue5-main branch]
2020-11-11 19:29:13 -04:00
Matt Kuhlenschmidt
156b9c1ec7 Content browser drawer improvements
- Always focus search field even when clicking drawer button
- Drawer is now summoned if there is no content browser when clicking the browse button in the details panel or asset editor.
- Creation of the content browser drawer is now handled by the content browser singleton.

[CL 14513618 by Matt Kuhlenschmidt in ue5-main branch]
2020-10-19 09:18:57 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
Matt Kuhlenschmidt
26a525f290 Content browser drawer now saves the content browser settings properly
[CL 13573657 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-28 16:14:24 -04:00
Matt Kuhlenschmidt
2bd788d145 Status Bar updates
- Content browser drawer now working well with ctrl+space as the default keybinding. Summoning the drawer will immediately focus the search bar.  Had to add some new hooks into the content browser api for that
- Moved status bar to a proper module

[CL 13470560 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-20 12:48:17 -04:00
rex hill
4511728f09 Tab manager filter can now block tab spawn
#rb chris.gagnon


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 11604269 via CL 11604360 via CL 11604439
#ROBOMERGE-BOT: (v656-11643781)

[CL 11743509 by rex hill in Main branch]
2020-02-28 11:30:46 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
graeme thornton
b282e0716f ContentBrowserSingleton now ensures that the editor style module is loaded before it access public static functions from within that module.
#ROBOMERGE-SOURCE: CL 10903489 via CL 10903490 via CL 10903491
#ROBOMERGE-BOT: (v626-10872990)

[CL 10903492 by graeme thornton in Main branch]
2020-01-08 07:04:40 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00