Commit Graph

80 Commits

Author SHA1 Message Date
IGood
e2a473dffd PR #6761: Fix for unsafe cast of IAssetTypeActions* to FAssetTypeActions_Base* (Contributed by IGood)
#jira UE-90292
#rb rex.hill

#robomerge[RELEASE] 4.25
#ROBOMERGE-SOURCE: CL 12069288 via CL 12069307 via CL 12069321
#ROBOMERGE-BOT: (v657-12064184)

[CL 12072296 by rex hill in Main branch]
2020-03-09 12:42:34 -04:00
dave belanger
a32107b87c Add option on whether to prompt user with checkout dialog in AssetFixUpRedirectors and use it to avoid pop-up in PPID generation.
#rb Rex.Hill


#ROBOMERGE-SOURCE: CL 11447143 via CL 11447144 via CL 11447146
#ROBOMERGE-BOT: (v654-11333218)

[CL 11447152 by dave belanger in Main branch]
2020-02-14 15:01:22 -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
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00
sebastian nordgren
8335597d9d Added DuplicateAssetWithDialogAndTitle() to IAssetTools, which allows for the user to specify a title for the asset saving dialog that is displayed.
#rb frank.fella


#ROBOMERGE-SOURCE: CL 10760652 via CL 10760653
#ROBOMERGE-BOT: (v610-10636431)

[CL 10760656 by sebastian nordgren in Main branch]
2019-12-17 04:37:20 -05:00
rex hill
25fb7f3068 Content browser class blacklist refactor to include subclasses
#rb jamie.dale


#ROBOMERGE-SOURCE: CL 10717848 via CL 10717920
#ROBOMERGE-BOT: (v610-10636431)

[CL 10717961 by rex hill in Main branch]
2019-12-13 15:30:01 -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
dave belanger
71fe32bd89 - Add IAssetTools::IsFixupReferencersInProgress
- Don't generate PPIDs upon world save if triggered by redirectors fixup.
#rb Matt.Kuhlenschmidt


#ROBOMERGE-SOURCE: CL 10322498 via CL 10322500
#ROBOMERGE-BOT: (v593-10286020)

[CL 10322501 by dave belanger in Main branch]
2019-11-20 13:57:50 -05:00
Patrick Enfedaque
d62d1195c4 Editing LevelPartitionGrid: Edigrate from //dev-editor-openworld
Multiple engine changes needed to support LevelGrid

#rb jeanfrancois.dube, sebastien.lussier, richard.malo
#rnx


#ROBOMERGE-OWNER: Patrick.Enfedaque
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 10318590 via CL 10318595
#ROBOMERGE-BOT: (v593-10286020)

[CL 10318965 by Patrick Enfedaque in Main branch]
2019-11-20 09:47:23 -05:00
marc audy
e8a2922b50 It is now possible to define a whitelist of asset classes that an editor session is allowed to use in the DefaultEditor.ini section [AssetTools] in an array called SupportedAssetTypes. Types that are not supported will not appear in the content browser or in context menus to create new assets.
#rb chris.gagnon
#rnx

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 10069511 via CL 10069512
#ROBOMERGE-BOT: (v574-10069753)

#codereview Sebastian.Nordgren

[CL 10074271 by marc audy in Main branch]
2019-11-07 15:07:26 -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
rob gay
cd6aa26746 Add ability for asset actions to provide submenu array to nest under asset creation context menu
#rb Jamie.Dale


#ROBOMERGE-SOURCE: CL 8757185 via CL 8783401
#ROBOMERGE-BOT: (v422-8689730)

[CL 8793703 by rob gay in Main branch]
2019-09-17 21:23:28 -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
benoit deschenes
22f347d191 Integrating CL 7700278
Fixing opacity mask using Virtual Textures at Datasmith import

#jira UE-78125
#rb Alexis.Matte

#ROBOMERGE-SOURCE: CL 7703036 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7703044 by benoit deschenes in Main branch]
2019-08-01 18:07:08 -04:00
Max Chen
7aac6cb97f Assets: Blueprint callable functions must be non const
#rb jamie.dale

[CL 6080254 by Max Chen in Dev-Sequencer branch]
2019-04-24 13:42:36 -04:00
Max Chen
4b4fedd7d1 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 5899701 by Max Chen in Dev-Sequencer branch]
2019-04-15 12:35:16 -04:00
Max Chen
6e03e44d41 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 5274591 by Max Chen in Dev-Sequencer branch]
2019-03-01 21:25:50 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Max Chen
fd89c0a6b7 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4957863 by Max Chen in Dev-Sequencer branch]
2019-02-10 00:20:33 -05: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
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -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
Marc Audy
ab108c215e Copying to Dev-Main @ CL# 4688301
#rb
#rnx

[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00