aurel cordonnier
d17d20ca36
Merge from Release-Engine-Test @ 16758890 to UE5/Main
...
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)
[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
aurel cordonnier
43fa62fcd8
Merge from Release-Engine-Test @ 16487383 to UE5/Main
...
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526
[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04: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
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
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
JeanMichel Dignard
9f7e63cdb6
Updated Datasmith Texture Importer to use the Interchange Framework
...
- Datasmith will only wait on the texture import result when it needs it for another asset (ie: material).
- Added a custom texture pipeline to set the datasmith attributes on the texture node.
- Created a FAsyncResult that behaves like a TFuture but calling Get will actually tick the task graph so that we don't deadlock when trying to get the future from the game thread while it depends on a game thread task.
#rb alexis.matte, richard.talbotwatkin
[CL 14228303 by JeanMichel Dignard in ue5-main branch]
2020-09-01 11:46:40 -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
david lesage
29c49218fe
Merging 11284724 //UE4/Dev-Enterprise to Release-4.25 (//UE4/Release-4.25)
...
CoreTechFileParser improvement : converting as soon as possible void* into TArray<Vector>, ...
#rb johan.duparc
#jira UE-88554
#ROBOMERGE-SOURCE: CL 11501199 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)
[CL 11501208 by david lesage in 4.25-Plus branch]
2020-02-18 11:20:44 -05:00
JeanMichel Dignard
84facd6d15
Copy from dev-enterprise cl 11097196
...
#rb none
#rnx
[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-23 16:28:59 -05:00
