Commit Graph

10208 Commits

Author SHA1 Message Date
jules blok
5a5e894e41 Disable VRMode when using the OpenXR plugin
#jira UE-73237
#rb none
#lockdown cristina.riveron

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 6482164 in //UE4/Release-4.22/... via CL 6482183
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6529128 by jules blok in Dev-Anim branch]
2019-05-16 02:59:41 -04:00
patrick enfedaque
fae1b138f8 - Landscape Layer System: Max Layer Setting (default to 8)
#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6478564 via CL 6481402 via CL 6481540
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6529008 by patrick enfedaque in Dev-Anim branch]
2019-05-16 02:58:50 -04:00
ben zeigler
826792bf0a #jira UE-74397 Fix regression where vector, rotator, transform, and linear color parameters inside a Make Struct node were not settable in the blueprint UI
#rb michael.noland
#lockdown nick.penwarden

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.zeigler
#ROBOMERGE-SOURCE: CL 6456549 in //UE4/Release-4.22/... via CL 6456550
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6475577 by ben zeigler in Dev-Anim branch]
2019-05-15 08:24:45 -04:00
helge mathee
634a98e152 Fix crash in Control Rig Editor
#rb lina.halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6452571 via CL 6453606 via CL 6453624
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6473977 by helge mathee in Dev-Anim branch]
2019-05-15 08:04:28 -04:00
zach bethel
b5a1c3c38c Fixed issue where Slate brush resource widget could change the material domain on an engine material.
#jira UE-73090
#rb Chris.Gagnon
#lockdown cristina.riveron

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: zach.bethel
#ROBOMERGE-SOURCE: CL 6453052 in //UE4/Release-4.22/... via CL 6453065
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6473695 by zach bethel in Dev-Anim branch]
2019-05-15 07:59:58 -04:00
pj kack
b7ef6d3ada Fix cook -iterate bug with incorrect disk sizes and TagsAndValues in cooked asset registries
[FYI] ben.zeigler,daniel.lamb

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 6451296 via CL 6452092 via CL 6452211
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6473156 by pj kack in Dev-Anim branch]
2019-05-15 07:53:40 -04:00
patrick enfedaque
d24d97832a - Landscape Layer System:
Fix Undo/Redo weightmap rare bug
Fix Undo/Redo of use cases where RequestLayersContentUpdateForceAll was undone.
Force Update now just propagates to components instead of maintaining a flag in the Proxy

#rb richard.malo
[FYI] michael.dupuis
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6445987 via CL 6447681 via CL 6447719
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6472399 by patrick enfedaque in Dev-Anim branch]
2019-05-15 07:25:54 -04:00
patrick enfedaque
185f5bda5d - Landscape Layer System: OnPreSave make sure we have generated final data
#rb richard.malo,michael.dupuis
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6429172 via CL 6429955 via CL 6430000
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6471074 by patrick enfedaque in Dev-Anim branch]
2019-05-15 06:26:50 -04:00
john white
0d490c766c Back out changelist 6409593
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: john.white
#ROBOMERGE-SOURCE: CL 6427274 via CL 6427662 via CL 6428670
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6470765 by john white in Dev-Anim branch]
2019-05-15 06:14:35 -04:00
richard malo
1553f434f7 - Added Subtractive blend support for Height layers in Landscape Layer System
- Fixed bug with Landscape Layer alpha was applied twice for height maps
#rb michael.dupuis
[FYI] patrick.enfedaque
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 6426297 via CL 6426394 via CL 6426398
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6470513 by richard malo in Dev-Anim branch]
2019-05-15 06:01:57 -04:00
pj kack
17f7b15454 Fix cook -iterative bug in UCookOnTheFlyServer::ConvertCookedPathToUncookedPath causing unnecessary recook of game packages for projects located at different folder depth than Engine.
Remove some more string allocations.

#rb stefan.boberg

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 6425832 via CL 6425885 via CL 6425899
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6470487 by pj kack in Dev-Anim branch]
2019-05-15 06:00:34 -04:00
kevin ortegren
84e6bfd05e Tweak desired width of the EMaterialShadingModel combobox to fit longer names
#rb none
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6424345 via CL 6424413 via CL 6424420
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6470449 by kevin ortegren in Dev-Anim branch]
2019-05-15 05:57:40 -04:00
john white
657f3bfc57 HDR - Add HDR display modes to Windows editor when running with D3D11 RHI and on Windows 10 > 1803
#rb ben.woodhouse

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: john.white
#ROBOMERGE-SOURCE: CL 6409593 via CL 6409859 via CL 6410616
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6467768 by john white in Dev-Anim branch]
2019-05-15 04:58:42 -04:00
josh jensen
2b6aa7e614 Guard against a possible shutdown crash in SLevelEditor
#jira UE-74139
#rb Allan.Bentham

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.jensen
#ROBOMERGE-SOURCE: CL 6402530 via CL 6404077 via CL 6404190
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6464477 by josh jensen in Dev-Anim branch]
2019-05-15 04:19:16 -04:00
michael dupuis
68b46b6536 Added support for the layer system into Change Component Size tool
Changed the ALandscapeProxy::Import function to support import of multiple layers as the function is used during the New Landscape with/without Import, World Composition Import/Add and Change Component Size.
The order of operations was changed to prevent having to call multiple times CreateLandscapeInfo, as the 1st few times, the content is not all ready.

#rb Richard.Malo, Patrick.Enfedaque

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 6401763 via CL 6403790 via CL 6403900
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6463926 by michael dupuis in Dev-Anim branch]
2019-05-15 04:14:14 -04:00
josh jensen
7ff77f66ab Change the Feature Rendering Level back to SM5 when disabling Android ES2, ES3.1, or Vulkan if one is the active Feature Rendering Level
#jira UE-70580
#rb Allan.Bentham

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.jensen
#ROBOMERGE-SOURCE: CL 6400587 via CL 6402808 via CL 6402891
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6462297 by josh jensen in Dev-Anim branch]
2019-05-15 04:01:26 -04:00
jurre debaare
157686f0f9 Fix incremental build CIS to use include rather than forward declaration for USkeletalMesh
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6401028 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6461602 by jurre debaare in Dev-Anim branch]
2019-05-15 03:57:11 -04:00
josh jensen
64dc11d92c Fill in the Optimizations Viewmode Settings menu according to the capabilities of the active Rendering Level
#jira UE-72223
#rb Allan.Bentham

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.jensen
#ROBOMERGE-SOURCE: CL 6399925 via CL 6400703 via CL 6400713
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6461118 by josh jensen in Dev-Anim branch]
2019-05-15 03:54:38 -04:00
rex hill
09e02952b2 Add include
#rnx
#rb none
#jira UE-74374

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 6398273 via CL 6398941 via CL 6398973
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6459329 by rex hill in Dev-Anim branch]
2019-05-15 03:43:17 -04:00
rex hill
b8bb819f3e Change for static analysis
#rnx
#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 6398066 via CL 6398560 via CL 6398568
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6459033 by rex hill in Dev-Anim branch]
2019-05-15 03:41:17 -04:00
patrick enfedaque
759951cb6e Fix Create Adjacent Landscape Proxy not setting the proper LandscapeSectionOffset
#rb dmitriy.dyomin
[FYI] richard.malo, michael.dupuis

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6397253 via CL 6398105 via CL 6398112
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6458244 by patrick enfedaque in Dev-Anim branch]
2019-05-15 03:36:51 -04:00
patrick enfedaque
4c56b66b0c - Landscape Layer System: Prevent editing of Landscapes in some situations with error banner
Landscape Actor not loaded (in layer mode)
Landscape has layer content but Experimental flag is disabled

#rb richard.malo
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: patrick.enfedaque
#ROBOMERGE-SOURCE: CL 6396907 via CL 6397438 via CL 6397448
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6458151 by patrick enfedaque in Dev-Anim branch]
2019-05-15 03:35:56 -04:00
jurre debaare
dbeec7eec3 Merging //Tasks/Fortnite/Dev-AlternativeSkinWeights/... to //Fortnite/Main/...
#rb Martin.Wilson

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6396117 via CL 6396387 via CL 6396453
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6458022 by jurre debaare in Dev-Anim branch]
2019-05-15 03:35:08 -04:00
projectgheist
664f300fbf PR #5688: Blend poses have pins by default (Contributed by projectgheist)
#jira: UE-72441
#rb: Martin.Wilson

[CL 6426679 by Lina Halper in Dev-Anim branch]
2019-05-13 09:38:52 -04:00
rex hill
7d22643080 Missing file
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 6378390 via CL 6384178 via CL 6384286
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6389542 by rex hill in Dev-Anim branch]
2019-05-08 21:17:15 -04:00