Matt Peters
d64cf41728
AssetRegistry includes (Engine Plugins): change #include "AssetData.h" -> #include "AssetRegistry/AssetData.h", and similar for the other moved AssetRegistry headers.
...
#rb Zousar.Shaker
#rnx
#preflight 6270563191629533ec2b6f6e
[CL 20017756 by Matt Peters in ue5-main branch]
2022-05-02 18:59:38 -04:00
aurel cordonnier
fc542f6cfd
Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
...
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971
[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
Marcus Wassmer
3b81cf8201
Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
...
autoresolved files
#rb none
[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
brooke hubert
48113fc77e
Adding EditorFramework to build.cs files
...
#rnx
#Jira UE-96448
#rb chris.gagnon
[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
ori cohen
3493053799
Set various chaos related modules to have access to level 1 files
...
#rb none
#ROBOMERGE-OWNER: ori.cohen
#ROBOMERGE-AUTHOR: ori.cohen
#ROBOMERGE-SOURCE: CL 12511442 via CL 12511458 via CL 12511475 via CL 12511478
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)
[CL 12511485 by ori cohen in Main branch]
2020-04-01 17:09:25 -04:00
Marc Audy
360d078ca3
Second batch of remaining Engine copyright updates.
...
#rnx
#rb none
[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05: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
max whitehead
dc0275a73b
Fix blank icons for Chaos and Geometry Collection plugins ChaosDestructionDemo.
...
#jira UE-75836
#rb none
#ROBOMERGE-SOURCE: CL 7978735 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)
[CL 7978791 by max whitehead in Main branch]
2019-08-13 11:00:45 -04:00
Michael Lentine
8d60747eef
Fix monolithic builds.
...
#rb none
#jira ue-75975
[CL 6954085 by Michael Lentine in Main branch]
2019-06-12 09:39:59 -04:00
Michael Lentine
f9b3324b32
Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
...
#rb none
#rnx
[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -04: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
Ben Marsh
7598af0532
Update copyright notices to 2019.
...
#rb none
#lockdown Nick.Penwarden
[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Matt Kuhlenschmidt
7a313bf0eb
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4659626 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-13 17:04:16 -05:00
Michael Lentine
ea5ca985d4
Copying //UE4/Dev-Physics to //UE4/Dev-Main.
...
#rb none
#lockdown Nick.Penwarden
[CL 4653110 by Michael Lentine in Main branch]
2018-12-12 11:25:29 -05:00
