Commit Graph

72 Commits

Author SHA1 Message Date
rex hill
3a42191ac5 Path view widget can now optionally filter out read-only folder paths
#rb none


#ROBOMERGE-SOURCE: CL 11769465 via CL 11772196 via CL 11772390
#ROBOMERGE-BOT: (v656-11643781)

[CL 11869116 by rex hill in Main branch]
2020-03-03 11:33:58 -05:00
Chris Gagnon
76c6bcbfeb UE4 Main merged to Dev-Tools-Staging at CL 11164391
#rb none

[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -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
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -05:00
rex hill
63f58eda9f Allow plugins to control which folders are writable
#rb jamie.dale


#ROBOMERGE-SOURCE: CL 11075022 via CL 11075023 via CL 11075025
#ROBOMERGE-BOT: (v637-11041722)

[CL 11075026 by rex hill in Main branch]
2020-01-21 14:04:13 -05:00
rex hill
09fdaadbf6 Content Browser: Context menu when clicking on folders converted to tool menu
#jira
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11064475 via CL 11064485 via CL 11064487
#ROBOMERGE-BOT: (v637-11041722)

[CL 11064489 by rex hill in Main branch]
2020-01-20 11:37:07 -05:00
rex hill
cb2ede8d41 Content Browser: Asset View Button context menu
#rb none


#ROBOMERGE-SOURCE: CL 10928106 via CL 10928108 via CL 10928115
#ROBOMERGE-BOT: (v626-10872990)

[CL 10928117 by rex hill in Main branch]
2020-01-09 12:03:53 -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
rex hill
01959e1487 Refactor folder blacklists
#ROBOMERGE-SOURCE: CL 10709001 via CL 10713780
#ROBOMERGE-BOT: (v610-10636431)

[CL 10713969 by rex hill in Main branch]
2019-12-13 14:29:24 -05:00
rex hill
0c48b4f980 Content browser folders to display can now be filtered using delegates registered by plugins
#rb chris.gagnon


#ROBOMERGE-SOURCE: CL 10594524 via CL 10594527
#ROBOMERGE-BOT: (v607-10590470)

[CL 10594530 by rex hill in Main branch]
2019-12-06 13:25:28 -05:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00
Lina Halper
3fd7f76532 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main)
#fyi: Laurent.Delayn, Marc.Audy
#rb: none

[CL 9321182 by Lina Halper in Main branch]
2019-10-01 16:59:31 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
simon tourangeau
5ecedcab2d Path Selection Window
When user selects target path for exporting or saving, we need to refresh content from server. So we add OnPathSelected event to FSharedAssetDialogConfig and SAssetDialog.
Changed files: IContentBrowserSingleton.h, SAssetDialog.h, SAssetDialog.cpp.

GPumpingMessages
When files and folders are deleted or created by user, we want to save these changes to server. So we monitor such changes through IAssetRegistry. But we need to determine whether it�s triggered by user. So we add GPumpingMessages, a global flag indicating that application is processing Windows messages. Which means it�s triggered by user input.
Another possible choice is adding delegates. But this requires more changes and is less general.
Changed files: CoreGlobals.h, CoreGlobals.cpp, WindowsPlatformApplicationMisc.cpp.

Mesh Editor Small Fix
Fix an issue where vertex colors in Toolbar didn't work in 4.22.
Changed file is SStaticMeshEditorViewport.cpp.

#jira UE-78897

PR #6121: Editor changes for NVIDIA USD plugin

#rb chris.gagnon
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8042071 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8042138 by simon tourangeau in Main branch]
2019-08-14 16:18:58 -04:00
bob tellez
d4d666eb99 Partial merge. Will redo SClassViewer.cpp implementation since the structure is different in UE4/Main. All other changes came over cleanly
#UE4 Added AssetReferenceFilter. An editor feature to allow projects to specify a filter to disallow editor systems to form references between certain assets. Add a listener for UUnrealEdEngine::OnMakeAssetReferenceFilter which returns a subclass of IAssetReferenceFilter that was constructed with the supplied context. PassesFilter will be called on this filter object to determine if the reference is allowed. Currently respected by asset picker, class picker, details panels, and edgraph drag/drop operations.

#jira UE-75912

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7046716 via CL 7046768
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)

[CL 7119780 by bob tellez in Dev-Anim branch]
2019-06-21 01:13:36 -04:00
bob tellez
396eacbdc1 Partial merge. Will redo SClassViewer.cpp implementation since the structure is different in UE4/Main. All other changes came over cleanly
#UE4 Added AssetReferenceFilter. An editor feature to allow projects to specify a filter to disallow editor systems to form references between certain assets. Add a listener for UUnrealEdEngine::OnMakeAssetReferenceFilter which returns a subclass of IAssetReferenceFilter that was constructed with the supplied context. PassesFilter will be called on this filter object to determine if the reference is allowed. Currently respected by asset picker, class picker, details panels, and edgraph drag/drop operations.

#jira UE-75912


#ROBOMERGE-SOURCE: CL 7046716
#ROBOMERGE-BOT: (v367-6836689)

[CL 7046768 by bob tellez in Main branch]
2019-06-17 13:36:16 -04:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Thomas Sarkanen
7088a2f273 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
#rb none
#jira none

[CL 4684302 by Thomas Sarkanen in Dev-Anim branch]
2019-01-07 05:38:46 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
Matt Kuhlenschmidt
0c387a28a1 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4395683 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-09-25 13:44:09 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00