Commit Graph

61 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Fred Kimberley
be42b159eb Fixing broken build
#rb trivial

[CL 14370210 by Fred Kimberley in ue5-main branch]
2020-09-22 17:10:45 -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
david ratti
0f60992e77 Network Prediction
-Fix ensure with automation based AP clients
-Better support for OOB mod tracing: aux state changes are now properly traced. Optonal "User String" is now supported along with the mod, to track who made the change.
-Search highlight border size increasd to make it a little more visible.

#rnx

#ROBOMERGE-SOURCE: CL 12505881 via CL 12505884 via CL 12505886
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12505896 by david ratti in Main branch]
2020-04-01 09:56:02 -04:00
robomerge
5a2e203df5 NetworkPrediction Plugin
-Refactor and simplifying replicated buffer+repController  implementation

#rnx

#ROBOMERGE-SOURCE: CL 12495661 via CL 12495664 via CL 12495666
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12495669 by robomerge in Main branch]
2020-03-31 07:44:04 -04:00
david ratti
9876d152c7 Remove unnecessary modules that were causing warnings in non editor builds
#rnx


#ROBOMERGE-SOURCE: CL 12222451
#ROBOMERGE-BOT: (v663-12210973)

[CL 12222460 by david ratti in Main branch]
2020-03-16 16:19:24 -04:00
david ratti
19d15a647e Network Prediction Insights
Runtime changes for supporting new tracing system for debugging.


#RNX


#ROBOMERGE-SOURCE: CL 12195143
#ROBOMERGE-BOT: (v662-12191386)

[CL 12195226 by david ratti in Main branch]
2020-03-16 07:41:42 -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
david ratti
dc93424f29 Network Prediction Plugin
-Added Cue example to Mock Simulation

#rnx


#ROBOMERGE-SOURCE: CL 10495381 via CL 10495386
#ROBOMERGE-BOT: (v606-10482310)

[CL 10495388 by david ratti in Main branch]
2019-12-03 09:17:12 -05:00
david ratti
73d2f9800b NetworkPrediction Plugin
-NetSimCue cleanup, some changes to organization and syntax of cue traits. now supports setting trait presets inside of class
-More comments

#rnx


#ROBOMERGE-SOURCE: CL 10453131 via CL 10453134
#ROBOMERGE-BOT: (v595-10452236)

[CL 10453139 by david ratti in Main branch]
2019-11-26 11:05:28 -05:00