Commit Graph

327 Commits

Author SHA1 Message Date
Brandon Schaefer
e266d81a91 Move to new llvm clang 9.0.1 v16 toolchain
#jira UE-85219
#rb none
#fyi Michael.Sartain

[CL 11448348 by Brandon Schaefer in 4.25 branch]
2020-02-14 16:01:35 -05:00
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
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
andrew grant
a1a1845816 Adding -w to the grep (now -wi) in the bash script that builds UBT so it isn't triggered by warnings that involved a variable with 'Error' in its name.
(In my case it was 'Missing XML comment for publicly visible type or member 'ReadOnlyTargetRules.bUndefinedIdentifierErrors').

[FYI] ben.marsh


#ROBOMERGE-SOURCE: CL 11191147 via CL 11191149
#ROBOMERGE-BOT: (v640-11091645)

[CL 11191151 by andrew grant in Main branch]
2020-01-30 20:49:07 -05:00
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
ryan durand
c11c085cf5 (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10871196 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v626-10872990)

[CL 10902202 by ryan durand in Dev-Core branch]
2020-01-08 03:04:20 -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
Martin Ridgers
87cc3f5749 Native MSBuild implementation of UnrealBuildTool's discovery of platform extensions.
#rb josh.adams, ben.marsh

(ushell-p4-cherrypick of 7973988 by Martin.Ridgers)

(ushell-p4-cherrypick of 8124246 by Martin.Ridgers)

[CL 10889764 by Martin Ridgers in Dev-Core branch]
2020-01-07 06:58:43 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Juan Canada
ee60030a97 Merging //UE4/Dev-Main@10113801 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10114485 by Juan Canada in Dev-RenderPlat-Staging branch]
2019-11-12 14:05:17 -05:00
andrew grant
59b1cb503b Addresses issue where mono > 5 is installed but msbuild isn't
#jira UE-80757
#tests tested with mono installed and with renaming the installed mono dir to verify things were detected properly and msbuild / xbuild selected
[at]ben.marsh [at]michael.trepka

#ROBOMERGE-SOURCE: CL 10075026 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10075032 by andrew grant in Main branch]
2019-11-07 15:34:56 -05:00
Juan Canada
fa7e56abf2 Merging //UE4/Dev-Main@9893499 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 9894327 by Juan Canada in Dev-RenderPlat-Staging branch]
2019-10-30 14:44:08 -04:00
nick shin
1ed1f81641 HTML5 - more code removal - build scripts section
#jira UE-80050  Remove HTML5 code from engine
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 9884438 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v553-9872581)

[CL 9884441 by nick shin in Main branch]
2019-10-29 15:07:15 -04:00
Rolando Caloca
b2f16b6664 Merging //UE4/Main@9828053 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9843531 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-25 16:30:45 -04:00
nick shin
970bcfd431 #jira UE-82158 HTML5 batch files dir still exists in Engine\Build\BatchFiles
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 9752558 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v545-9751379)

[CL 9752562 by nick shin in Main branch]
2019-10-22 17:41:57 -04:00
brandon schaefer
9abd2890cd Fix find platform extension for Linux/Mac
#jira none
#rb none
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 9736069 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9736089 by brandon schaefer in Main branch]
2019-10-21 15:05:50 -04:00
Matt Collins
5b92997cdf Fixing our references project generation. Should write to $REFERENCE_FILE (and not %REFERENCE_FILE%)
#rb none

[CL 9577259 by Matt Collins in Main branch]
2019-10-14 19:12:44 -04:00
Matt Collins
2f59cee486 Fix take two. Need to write to $REFERENCE_FILE and not %REFERENCE_FILE%
#rb none

[CL 9577244 by Matt Collins in Dev-RenderPlat-Staging branch]
2019-10-14 19:09:08 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Rolando Caloca
505a4a068c DRPS - Back out changelist 8124246
#rb Martin.Ridgers
#rnx

[CL 9550413 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-11 14:05:02 -04:00
jeff newquist
1ff08f0bf7 Copying //UE4/Dev-Console to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none
#rnx

[CL 9445960 by jeff newquist in Dev-RenderPlat-Staging branch]
2019-10-07 10:54:53 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -04:00