Commit Graph

5079 Commits

Author SHA1 Message Date
bob tellez
041d1474ec #UE4 Adding even more info to a warning about failing to write to the DDC
#ROBOMERGE-SOURCE: CL 9549181 via CL 9549190
#ROBOMERGE-BOT: (v521-9539702)

[CL 9549192 by bob tellez in Main branch]
2019-10-11 12:38:37 -04:00
Alexis Matte
f5f97e8a3e Fix crash when re-importing alternate skinning. This is a fallback from the skeletalmesh refactor
#jira none
#rb none

[CL 9549105 by Alexis Matte in Main branch]
2019-10-11 12:24:35 -04:00
Lukas Hermanns
82cd916c43 Integrated SPIRV-Cross fix of expression unpacking (see /github.com/KhronosGroup/SPIRV-Cross/issues/1172), and rebuild ShaderConductor for Mac and Win64.
#rb none
#jira UE-80725
#fyi Will.Damon, Matt.Collins
#rnx

[CL 9548063 by Lukas Hermanns in Main branch]
2019-10-11 10:44:55 -04:00
jimmy smith
6aaf321b7e SoundNodeQuality should be evaluated during cooking
#rb Aaron.Mcleran, Marc.Audy, Ethan.Geller
#jira UE-80323


#ROBOMERGE-OWNER: jimmy.smith
#ROBOMERGE-AUTHOR: jimmy.smith
#ROBOMERGE-SOURCE: CL 9542946 via CL 9542950
#ROBOMERGE-BOT: (v521-9539702)

[CL 9543087 by jimmy smith in Main branch]
2019-10-10 17:58:16 -04:00
jamie dale
3d4aec0159 Defer Output Log text layout modification to Tick
This avoids the text layout for the Output Log being modified while the Output Log itself is being painted (eg, from messages being logged during OnPaint).

#jira UE-59184
#rb Francis.Hurteau


#ROBOMERGE-OWNER: jamie.dale
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 9541025 via CL 9541026
#ROBOMERGE-BOT: (v521-9539702)

[CL 9541261 by jamie dale in Main branch]
2019-10-10 15:48:28 -04:00
bob tellez
4eaef4199b #UE4 Added some log info to another warning about writing to DDC folders.
#ROBOMERGE-SOURCE: CL 9492875 via CL 9492877
#ROBOMERGE-BOT: (v519-9489664)

[CL 9492878 by bob tellez in Main branch]
2019-10-09 15:40:03 -04:00
bob tellez
781996be06 #UE4 Also including the error code in DDC write failure log
#ROBOMERGE-SOURCE: CL 9491930 via CL 9491946
#ROBOMERGE-BOT: (v519-9489664)

[CL 9491961 by bob tellez in Main branch]
2019-10-09 15:02:54 -04:00
bob tellez
6a742e30a4 #UE4 Add a little more info to a warning about failing to write a file to a filesystem DDC backend
#ROBOMERGE-SOURCE: CL 9491553 via CL 9491564
#ROBOMERGE-BOT: (v519-9489664)

[CL 9491566 by bob tellez in Main branch]
2019-10-09 14:39:34 -04:00
improbable-valentyn
fc29a64867 PR #6273: Fix memory leak in SOutputLog (Contributed by improbable-valentyn)
#jira UE-81496
#rb lauren.barnes

[CL 9486987 by Rex Hill in Main branch]
2019-10-09 10:05:01 -04:00
ionut matasaru
556e7e3b31 [Insights] Integrated CL 9470738 from dev-core. Fixed tree views (Timers, Counters, Generic Tree Table view and Net Stats) not being properly invalidated and showing outdated values for aggregated stats. Changed tooltips for tree views to be created only when needed.
#jira UE-81501
#rb none

[CL 9486090 by ionut matasaru in Main branch]
2019-10-09 08:01:00 -04:00
Jamie Dale
8a860415dd Fixed localization conflicts
#rb none
#rnx

[CL 9477638 by Jamie Dale in Main branch]
2019-10-08 14:28:14 -04:00
marc audy
85c504b401 Metal fixes for terrain and water.
- Disallow draw indirect path of single layer water on Metal.
- Force FMA under special circumstances, credit: Richard Wallis.

[REVIEW] [at]krzysztof.narkowicz [at]lukas.hermanns [at]rolando.caloca
#rb
#rnx

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: will.damon
#ROBOMERGE-SOURCE: CL 9475388 via CL 9475409 via CL 9475414 via CL 9475420 via CL 9475438
#ROBOMERGE-BOT: (v508-9471939)

[CL 9476347 by marc audy in Main branch]
2019-10-08 13:28:47 -04:00
Alexis Matte
0f4fdea43c Fix disabled section recovery after a reimport on a inline reduced LOD. Also fix an issue with morph LOD remap when there is a cloth section not at the end of the sections
#jira UE-79584
#rb none
#rnx

[CL 9466245 by Alexis Matte in Main branch]
2019-10-07 17:36:43 -04:00
hongyi yu
b22caf3c66 Handle UInt64 output properly when list file with unrealpak
#ROBOMERGE-SOURCE: CL 9421816 via CL 9422754
#ROBOMERGE-BOT: (v480-9420520)

[CL 9423096 by hongyi yu in Main branch]
2019-10-04 16:50:41 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
Ben Marsh
8644d102b7 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9419766 by Ben Marsh in Main branch]
2019-10-04 11:51:39 -04:00
Ben Marsh
5082183952 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419737 by Ben Marsh in Dev-Build branch]
2019-10-04 11:49:01 -04:00
Alexis Matte
fe503d708e Remerge cl: 9413572 into main it was backout in cl: 9418047
Undefine all portions of code that deal with the Apex clothing file import unless the project is built with Apex.
This is to prevent unnecessary Apex dependencies leaking into the Chaos Cloth asset code, and will allow the removal of PhysX when needed.

#rb Jaco.Vandyk
#jira UE-81340

[CL 9419541 by Alexis Matte in Main branch]
2019-10-04 11:26:38 -04:00
Ben Marsh
b6039a9873 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419420 by Ben Marsh in Dev-Build branch]
2019-10-04 11:20:44 -04:00
Alexis Matte
37868d2163 Back out changelist 9413572, it was a bad merge and need to be redone.
#rb none

[CL 9418047 by Alexis Matte in Main branch]
2019-10-04 10:11:57 -04:00
kriss gossart
f71c8515c7 Undefine all portions of code that deal with the Apex clothing file import unless the project is built with Apex.
This is to prevent unnecessary Apex dependencies leaking into the Chaos Cloth asset code, and will allow the removal of PhysX when needed.

#rb Jaco.Vandyk
#jira none

Merging //Fortnite/Main/Engine/Source/... to //UE4/Main/Engine/Source/...

[CL 9413572 by kriss gossart in Main branch]
2019-10-04 05:26:38 -04:00
Marc Audy
9365ba3972 Make UE_TRACE_TABLE_COLUMN and UE_TRACE_TABLE_PROJECTED_COLUMN only defined for windows again until Stefan and Ionut can investigate Mac compile errors
#rb Stefan.Boberg
#rnx
#fyi Stefan.Boberg, Ionut.Matasaru

[CL 9406841 by Marc Audy in Main branch]
2019-10-03 17:52:19 -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
ethan geller
a84d71f486 #ROBOMERGE-SOURCE: CL 9387878 via CL 9387880
#ROBOMERGE-BOT: (v456-9359915)

[CL 9389736 by ethan geller in Main branch]
2019-10-03 09:09:42 -04:00
michael lentine
acbc579509 Copy from //Fortnite/Dev-Physics
#rb none


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 9374650 via CL 9374665
#ROBOMERGE-BOT: (v456-9359915)

[CL 9385990 by michael lentine in Main branch]
2019-10-02 17:27:26 -04:00