Commit Graph

9 Commits

Author SHA1 Message Date
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
michael trepka
fb67a2b5c3 Copy of CL 10625418 by Ben.Marsh
Fix missing UAT/UBT log output on Mac (fallout from CL 6849473). Standard macros set through the DefineConstants property (eg. "TRACE") were being overwritten by __MonoCS__, causing TraceLog() function calls to be compiled out.



#ROBOMERGE-OWNER: michael.trepka
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 10636055 via CL 10636127 via CL 10636131
#ROBOMERGE-BOT: (v609-10634694)

[CL 10636132 by michael trepka in Main branch]
2019-12-10 10:56:43 -05:00
Jeff Fisher
e86444407c UE-81878 Unable to package projects for Android error MSB4186: Invalid static method invocation syntax
#rb Ryan.Vance
#review-9625772
#jira UE-81878

[CL 9625820 by Jeff Fisher in Main branch]
2019-10-16 19:13:53 -04:00
Ben Marsh
60efbc77ea Fix compiling UAT when AutoSDK is not available.
#rb none
#rnx
#robomerge main

[CL 9562410 by Ben Marsh in Dev-Build branch]
2019-10-11 21:36:55 -04:00
Ben Marsh
bbfa349d8c Add support for using AutoSDK in the HoloLens automation project.
#rb none
#rnx

[CL 9551558 by Ben Marsh in Dev-Build branch]
2019-10-11 16:01:19 -04:00
joe conley
30559f99b7 Merging 7325797 using 4.23_to_Dev-VR
Now requiring a certificate to package HL2
Now requiring "CN=" in the company name for creating a certificate

#JIRA: UE-76506
#RB: jason.bestimt

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 7678483 in //UE4/Release-4.23/... via CL 7678484
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7804620 by joe conley in Dev-Build branch]
2019-08-06 12:25:41 -04:00
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -04:00