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
michael daum
d3a30f134e
Add UnrealWidgetFwd.h temporarily to IncludeTool's Rules.cs to fix SA
...
The real fix will be to rename this file but since this is for M2 I will do that afterwards in UE5-Main
#rb marc.audy
#rb ben.marsh
#jira UE-99494
#robomerge Release-5.0-M2
#rnx
[CL 14302955 by michael daum in ue5-main branch]
2020-09-11 17:24: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
Jeff Farris
76ba011b1a
Editgrated 14042502 from Dev-CharacterTech to UE5/Main. Fixes IncludeTool static analysis errors.
...
#fyi andrean.franc
[CL 14046732 by Jeff Farris in ue5-main branch]
2020-08-06 10:14:09 -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
ori cohen
713b54d9d8
Added fwd header to IgnoreFwdHeaders
...
Ben.Marsh
#jira UE-92262
#ROBOMERGE-SOURCE: CL 12958659 via CL 12958751 via CL 12959111
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)
[CL 12959913 by ori cohen in Main branch]
2020-04-21 15:23:34 -04:00
Josh Adams
eafc89607e
- Yet more lz4 fixes, for NonUnity, this time
...
#rb none
#jira UE-88502, UE-88501
#rnx
[CL 11341032 by Josh Adams in Main branch]
2020-02-11 10:59:23 -05:00
Josh Adams
75ef276574
- Final fix for lz4 IncludeTool warnings
...
#rb none
[CL 11309470 by Josh Adams in Main branch]
2020-02-10 15:04:04 -05:00
Josh Adams
43f1cc0c0b
- Undid the IncludeTool change because it caused another issue, solving it another way
...
#rb Martin.Ridgers
[CL 11305096 by Josh Adams in Main branch]
2020-02-10 11:51:32 -05:00
Josh Adams
35a7ce4cab
- Added lz4.h to be marked as External header so IncludeTool analysis won't report inconsistent preprocessor settings (lz4hc.h includes twice lz4.h with different defines set)
...
#rb ben.marsh
#rnx
[CL 11303941 by Josh Adams in Main branch]
2020-02-10 10:51:38 -05:00
Martin Ridgers
7c1158ccab
IncludeTool: Skip over "__has_include" preprocessor statements. These statements take the form __has_include(x) where x is an quoted or <>-surrounded path. Thus the number of tokens is variable.
...
#rb ben.marsh
#jira ue-88191
#rnx
#ushell-cherrypick of 11290835 by Martin.Ridgers
[CL 11290866 by Martin Ridgers in Main branch]
2020-02-07 08:53:46 -05:00
Ben Marsh
223691a1fb
IncludeTool: Skip over "__has_warning" preprocessor tests.
...
#rb none
#jira UE-87659
[CL 11166487 by Ben Marsh in Main branch]
2020-01-29 15:00:10 -05:00
jordan cristiano
fa0fa0ddca
Fixed compile error introduced by CL 8497721 when modifying FramePro headers along with adaptive unity builds.
...
#error Platform must defined FRAMEPRO_GET_CLOCK_COUNT
and friends.
#rb ben.marsh
#ROBOMERGE-SOURCE: CL 10954319 via CL 10954401 via CL 10954426
#ROBOMERGE-BOT: (v632-10940481)
[CL 10954440 by jordan cristiano in Main branch]
2020-01-13 14:16:14 -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
Ben Marsh
298e9af268
Fix IncludeTool warnings for upropery headers.
...
#rb none
#rnx
[CL 10727476 by Ben Marsh in Main branch]
2019-12-14 09:42:10 -05:00
michael lentine
f302c5d5fc
Add cross platform ISPC support from Dev-Anim to accelerate Chaos computations.
...
#rb Ben.Marsh
#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316
#ROBOMERGE-BOT: (v610-10636431)
[CL 10727317 by michael lentine in Main branch]
2019-12-13 23:35:01 -05:00
Robert Manuszewski
7b6f840f7f
Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
...
#rb none
[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Markus Breyer
b662cc63b0
Addressed IncludeTool warnings for rapidjson
...
#jira SOL-890
#rb ben.marsh, mike.beach
#rnx
[CL 10513379 by Markus Breyer in Main branch]
2019-12-04 18:53:55 -05:00
Stefan Boberg
d2f9a61b06
Copy-up from Dev-Core
...
#rb none
[CL 10419044 by Stefan Boberg in Main branch]
2019-11-25 12:03:09 -05:00
Marc Audy
8d02cd2f99
Remove files that were exceptions to the #include rules, but no longer need to be
...
#rb
#rnx
#codereview Ben.Marsh
[CL 9911934 by Marc Audy in Main branch]
2019-10-31 13:44:03 -04:00
marc audy
b7a99f9bff
Still need DEPRECATED_FORGAME as well as UE_DEPRECATED_FORGAME
...
#jira
#rnx
[FYI] Ben.Marsh
#rb
#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 9739879 via CL 9741367 via CL 9741416 via CL 9741467
#ROBOMERGE-BOT: (v542-9736015)
[CL 9743717 by marc audy in Main branch]
2019-10-22 07:50:51 -04:00
marc audy
344624e273
Update IncludeTool to ignore UE_DEPRECATED_FORGAME instead of DEPRECATED_FORGAME as it was itself deprecated in 4.22
...
#jira
#rnx
#rb
[FYI] Ben.Marsh
#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 9739633 via CL 9741360 via CL 9741409 via CL 9741458
#ROBOMERGE-BOT: (v542-9736015)
[CL 9743652 by marc audy in Main branch]
2019-10-22 07:05:07 -04:00
marc audy
e58023be83
Fix incorrect start index for Substring when finding /FI
...
#rb Ben.Marsh
#jira
#rnx
#ROBOMERGE-SOURCE: CL 9735663 via CL 9735892 via CL 9735986 via CL 9736021
#ROBOMERGE-BOT: (v539-9700858)
[CL 9736061 by marc audy in Main branch]
2019-10-21 15:04:55 -04:00
