Commit Graph

3151 Commits

Author SHA1 Message Date
mark satterthwaite
3e7977bf7d Use dynamic casting to access Metal tessellation shader index buffers - means restoring the code path for R16Uint and R32Uint but that should be fine. This avoids the AMD driver bug that causes incorrect reads at the extreme beginning/end of a texture_buffer or texture2d created from an index buffer. Need to get to the bottom of this with the driver team.
#jira UE-69266
#rb none

#ROBOMERGE-SOURCE: CL 4956763 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4968434 by mark satterthwaite in Main branch]
2019-02-12 09:39:43 -05:00
steve robb
2359172217 Reset the module manager cache after recompiling an unloaded module just in case it's a brand new one.
#rb none
#jira UE-69366

#ROBOMERGE-SOURCE: CL 4953241 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4968360 by steve robb in Main branch]
2019-02-12 09:36:05 -05:00
alexis matte
a07870bbfe #CodeReview: alexis.matte,cristina.riveron,nick.bullard,nick.penwarden
Merge conflict.
alexis.matte, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore


--------------------------------------
Revert a material fix done for UE-67819, this change broke old assets.
#jira UE-69652
#rb none

#ROBOMERGE-SOURCE: CL 4951688 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4953006 by alexis matte in Main branch]
2019-02-08 17:32:01 -05:00
ben marsh
de43fd704b Various fixes for using a non-default source code accessor in the editor.
* Fix incorrect path for tutorial dialog explaining how to install Visual Studio
* Tell the user that they need to restart when changing their source code accessor.
* On Windows, always check for the presence of Visual Studio 2017 or 2019 when determining whether the user can compile. This is distinct from whether the user has the chosen IDE available.

#rb none
#jira UE-69253

#ROBOMERGE-SOURCE: CL 4951506 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4951508 by ben marsh in Main branch]
2019-02-08 15:46:29 -05:00
lauren ridge
7285b57316 Fix for excluding engine dependencies, not hiding copied asset, being able to advanced copy more than once
#rnx
#rb trivial
#jira UE-69728
#jira UE-69797
#jira UE-69727

#ROBOMERGE-SOURCE: CL 4948430 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4948433 by lauren ridge in Main branch]
2019-02-08 11:44:47 -05:00
brandon schaefer
96c82648fb Dont add to a container while using iterators. Invalidates the iterators
#jira UE-69646
[CODEREVIEW] Arciel.Rekman
[at]Arciel.Rekman
#rb Arciel.Rekman

#ROBOMERGE-SOURCE: CL 4947629 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4947637 by brandon schaefer in Main branch]
2019-02-08 09:44:11 -05:00
jack porter
7708296320 Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
Rebuild DeploymentServer
[FYI] Cosmin.Sulea
#rb None
#jira UE-69615

#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4947306 by jack porter in Main branch]
2019-02-08 07:33:53 -05:00
david harvey
dfe6ae3eee preparation work for XMA2 streaming:
- streamed decompression honours 'NumCompressedBytesConsumed'.
 - audio encoder indicates whether the sound is being cooked for streaming or not.
 - some XMA format checks.

#rb aaron.mcleran


#ROBOMERGE-SOURCE: CL 4930005 via CL 4930006 via CL 4939875

[CL 4939940 by david harvey in Main branch]
2019-02-07 19:37:39 -05:00
nick darnell
7894dfab4f Testing - removing a function from the functional testing manager that has no implementation.
#ROBOMERGE-SOURCE: CL 4925685 via CL 4925704 via CL 4925990 via CL 4926017 via CL 4927614

[CL 4935842 by nick darnell in Main branch]
2019-02-07 12:27:06 -05:00
andrew grant
0de4efcf07 Fixed warnings when workers are not ready yet.
Cut down on number of warnings issued.

#jira UE-66856
#rb na


#ROBOMERGE-SOURCE: CL 4925036 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4925037 by andrew grant in Main branch]
2019-02-06 17:43:24 -05:00
johan duparc
ac2144e4f4 fix build warning for [Compile UE4Editor Linux]
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 4924595 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4924599 by johan duparc in Main branch]
2019-02-06 16:51:30 -05:00
johan duparc
a79abfeef5 Copy of 4923653, 4923695 from //UE4/Dev-Enterprise:
UV packing issue for geometries with high chart count
#jira UE-69450
#jira UE-56602
#jira UE-56555
#jira UEENT-322
#rb JeanMichel.Dignard

#ROBOMERGE-SOURCE: CL 4923742 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4923746 by johan duparc in Main branch]
2019-02-06 15:01:38 -05:00
lauren ridge
9ec48fdd99 Folder advanced copy now works, preserves structure.
#jira UE-69540
#jira UE-69549
#rb Chris.Gagnon

#ROBOMERGE-SOURCE: CL 4923034 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4923061 by lauren ridge in Main branch]
2019-02-06 14:13:04 -05:00
Jian Ru
924462f628 Resolve robomerge conflicts
#jira none
#rb none
#fyi chris.bunner, jeff.williams

[CL 4920023 by Jian Ru in Main branch]
2019-02-06 09:46:41 -05:00
marc audy
2421367092 Remove redundent bCanEverTick sets from deprecated PostPhysicsComponentTick
#rnx
#rb


#ROBOMERGE-SOURCE: CL 4905422 via CL 4916794

[CL 4917396 by marc audy in Main branch]
2019-02-05 23:11:34 -05:00
Matt Collins
6b93e353eb Enabling Niagara VectorVM CVar.
#jira UE-69189
#rb none

[CL 4902577 by Matt Collins in Main branch]
2019-02-05 15:00:37 -05:00
nick shin
4bec847c88 #jira UE-69414 HTML5 multithreading option in binary builds needs to be set with SourceOnly property
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 4894518 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4894523 by nick shin in Main branch]
2019-02-04 18:44:44 -05:00
nick shin
3e0448a543 HTML5 - remove experimental HTML5 settings from Project Settings
- offscreen canvas
- LLVM wasm backend

#jira UE-69035  Remove experimental HTML5 multithreading booleans from Project Settings
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 4892400 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4892402 by nick shin in Main branch]
2019-02-04 18:19:05 -05:00
jamie dale
fff35f7e97 Swapped radio button for check button to fix UI glitch
#jira UE-68169
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 4892166 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4892169 by jamie dale in Main branch]
2019-02-04 17:26:12 -05:00
marcus wassmer
33106628c6 Add DXC runtime requirements to fix binary builds
#rb none
#jira UE-69482

#ROBOMERGE-SOURCE: CL 4892140 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4892143 by marcus wassmer in Main branch]
2019-02-04 17:21:10 -05:00
Matt Collins
a0c6fc9fd2 Disabling the vectorvm fix in main. It will propagate up through dev-rendering.
#rb none

[CL 4879790 by Matt Collins in Main branch]
2019-02-02 15:40:51 -05:00
anthony bills
3cf6b2b848 Add missing forward declaration of IFileHandle
#rb david.harvey


#ROBOMERGE-SOURCE: CL 4867533 via CL 4868977

[CL 4874246 by anthony bills in Main branch]
2019-02-01 19:03:16 -05:00
matt collins
022f230b84 Adds a cvar to allow niagara VM shader compilation to skip some of HLSLCC's backend optimization passes.
Depends on 4861258!

#jira UE-69189
#rb none
[FYI] morten.vassvik


#ROBOMERGE-SOURCE: CL 4861438 via CL 4865436

[CL 4873048 by matt collins in Main branch]
2019-02-01 18:49:12 -05:00
Ben Marsh
9f4e41b558 Fix non-unity compile error.
#rb none
#fyi Anthony.Bills

[CL 4868353 by Ben Marsh in Main branch]
2019-02-01 12:56:52 -05:00
Anthony Bills
a606671495 Fix missing module declaration in FileUtilities (4827582 introduced a link error check).
#rb david.harvey
#jira UE-69443

[CL 4867700 by Anthony Bills in Main branch]
2019-02-01 11:46:07 -05:00