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
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
aurel cordonnier
8f14e34a2e
CIS no unity fixes
...
#rb trivial
#jira none
[CL 16496557 by aurel cordonnier in ue5-main branch]
2021-05-27 22:11:51 -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
73635caf9c
Fixing CIS No Unity issues
...
#rb trivial
[CL 16405364 by aurel cordonnier in ue5-main branch]
2021-05-20 12:29:25 -04:00
aurel cordonnier
8eebe8841f
Merge UE5/RET @ 16305968 to UE5/Main
...
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937
[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -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
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
jeremie roy
2315c2814f
Fix uninitialized class pointer in ustruct
...
#rb geoffrey.douglas
[CL 15680655 by jeremie roy in ue5-main branch]
2021-03-11 16:27:16 -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
bc88b73a29
Merge Release-Engine-Staging to Main @ CL# 15151250
...
Represents UE4/Main @ 15133763
[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -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
Marc Audy
a7f9391231
Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
...
This represents UE4/Main @ 14768117
For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer
[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
Marc Audy
50a3d7d368
Merge Release-Engine-Staging to Main @ CL# 14467590
...
This represents UE4/Main @ 14432125 + some cherrypick fixes
[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
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
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
jeanmichel dignard
2ce7666d2d
Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)
[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
2020-01-07 15:54:23 -05: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
Robert Manuszewski
7b6f840f7f
Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
...
#rb none
[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Patrick Boutot
c42bda4b3b
Add IsAvailable to HttpServerModule. Check if the module is loaded before stoping the WebServer listner.
...
#rb francis.hurteau
#fyi johan.duparc
[CL 10468569 by Patrick Boutot in Dev-VirtualProduction branch]
2019-11-27 10:24:13 -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
francis hurteau
2310b6819d
Added a ResetToDefault option when setting properties through the WebControl API
...
Merged from CL 7141689
#jira UE-78276
#rb none
#ROBOMERGE-SOURCE: CL 7708125 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)
[CL 7708137 by francis hurteau in Main branch]
2019-08-02 13:16:19 -04:00