Commit Graph

7 Commits

Author SHA1 Message Date
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
uriel doyon
d90de75955 Fixed possible division by 0 warnings.
#jira UE-92225
#rb rolando.caloca
#lockdown marcus.wassmer

#ROBOMERGE-SOURCE: CL 12936941 in //UE4/Release-4.25/... via CL 12936944 via CL 12936950
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12936954 by uriel doyon in Main branch]
2020-04-20 16:18:25 -04:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
andrew grant
4a0e605510 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8063864 by andrew grant in Main branch]
2019-08-15 14:34:11 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
ryan vance
b4116a7ae5 Fixing FARSupportInterface reentrant crash on shutdown.
#jira UE-69036
#rb nickw

#ROBOMERGE-SOURCE: CL 5235491 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5235492 by ryan vance in Main branch]
2019-02-27 19:24:30 -05:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00