Commit Graph

19 Commits

Author SHA1 Message Date
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -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
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Sebastien Lussier
c634cb4520 Fix include path casing
#fyi marc.audy

[CL 14617887 by Sebastien Lussier in ue5-main branch]
2020-10-29 20:20:41 -04:00
Sebastien Lussier
acfae6c8f8 ThirdParty\OpenEXR - Moved includes to correct location (under "/include/openexr" rather than "/include")
* Fixed all includes of OpenEXR in the engine and plugins
* Will allow building other middlewares that rely on OpenEXR without hassle (ex: OpenVDB)
* Created build scripts (Windows only for now)
* Replicated a few UE specific changes that were made under Deploy/OpenEXR-2.3.0 to the source, so that a rebuild of the lib will not erase them
#rb jeanfrancois.dube, anousack.kitisa

[CL 14613618 by Sebastien Lussier in ue5-main branch]
2020-10-29 14:28:23 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04: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
johan duparc
6f7e2d451d Copy of 11271391 from //UE4/Dev-Enterprise:
Revit: Fix export time field in exported datasmith scene

#jira UE-88083
#rb none

#ROBOMERGE-SOURCE: CL 11604300 in //UE4/Release-4.25/... via CL 11604316
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11604350 by johan duparc in Main branch]
2020-02-25 10:49:26 -05:00
emil kirichev
b74abd7b27 Illegal characters in texture name don't survive datasmith export
Integrated from Dev-Enterprise (CL 11279033)

#jira UE-87907
#rb JeanLuc.Corenthin

#ROBOMERGE-SOURCE: CL 11459086 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11459090 by emil kirichev in 4.25-Plus branch]
2020-02-17 08:01:59 -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
Julien StJean
0967602090 Copy up //UE4/Dev-Enterprise/...at Changelist 10508152 to //UE4/Dev-Tools-Staging/...
#rb none

[CL 10508596 by Julien StJean in Dev-Tools-Staging branch]
2019-12-04 14:23:32 -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