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
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
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
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
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
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
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
michael noland
7632d23dea
Gameplay plugin category cleanup
...
#jira UE-106862
#ROBOMERGE-SOURCE: CL 15390280 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)
[CL 15390314 by michael noland in ue5-main branch]
2021-02-11 14:58:19 -04:00
Zousar Shaker
3b4c8fc1c5
Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
...
#rb none
[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
Zousar Shaker
a160958acf
Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
...
Avoiding use of implicit conversion to pointer reference on TObjectPtr (making it either explicit or using a reference to a TObjectPtr where that is an easy option).
#rb matt.peters
[CL 14840803 by Zousar Shaker in ue5-main branch]
2020-12-02 20:23:02 -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
Zousar Shaker
3cdeeb8075
Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr) Change ternary operators that are ambiguous when TObjectPtr can be implicitly constructed from a raw pointer. Also allow TObjectPtr to be implicitly constructed from an appropriate raw pointer.
...
#rb devin.doucette
[CL 14739879 by Zousar Shaker in ue5-main branch]
2020-11-12 18:18:02 -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
7379fa99c5
Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
...
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94
Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
...
#rb
#rnx
[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -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
peter knepley
409a679b8a
Get rid of force inline on UReplicationGraphNode_DynamicSpatialFrequency::CalcFrequencyForActor, blocks calling it from a child class
...
#jira
#ROBOMERGE-SOURCE: CL 12934538 via CL 12934550 via CL 12934609
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)
[CL 12934664 by peter knepley in Main branch]
2020-04-20 15:15:29 -04:00
brian bekich
7a7ba8b3be
AddNetworkActor now checks the driver ShouldReplicateActor the way the network object list does
...
#rb ryan.gerleve
#ROBOMERGE-SOURCE: CL 12764357 via CL 12764394 via CL 12764400 via CL 12764407
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)
[CL 12764415 by brian bekich in Main branch]
2020-04-13 16:06:28 -04:00
brian bekich
2cf7c28b86
Adding option to use control channel for destruction infos (net.ControlChannelDestructionInfo, disabled by default)
...
#rb ryan.gerleve
#ROBOMERGE-OWNER: brian.bekich
#ROBOMERGE-AUTHOR: brian.bekich
#ROBOMERGE-SOURCE: CL 12581815 via CL 12581817 via CL 12581904 via CL 12581932 via CL 12581943
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)
[CL 12581968 by brian bekich in Main branch]
2020-04-02 18:53:13 -04:00
jon nabozny
8d9878e1d8
Remove MaxArrayRepSize and MaxArrayRepMemory in favor of using UINT16_MAX everywhere.
...
[REVIEW] [at]Brian.Bekich, [at]Bart.Hawthorne
#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 12113573 via CL 12113575 via CL 12113576 via CL 12126498
#ROBOMERGE-BOT: (v659-12123632)
[CL 12126615 by jon nabozny in Main branch]
2020-03-11 10:50:17 -04:00
