Commit Graph

3097 Commits

Author SHA1 Message Date
josh adams
a519b4fbe4 - Reenabled encryption on bulk files with memory mapping - and then disallow mapping at runtime
#rb gil.bribb
[FYI] gil.gribb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4998359 via CL 4998360 via CL 4999252 via CL 5001374
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5079711 by josh adams in Dev-VR branch]
2019-02-19 18:36:44 -05:00
josh adams
021ac88d25 iOS - Enabled animation memory mapped IO on IOS. Saves 10-20 megs of memory
#rb josh.adams

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 4993025 via CL 4993026 via CL 4995423 via CL 4999718
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5077329 by josh adams in Dev-VR branch]
2019-02-19 18:11:03 -05:00
rolando caloca
c56220b791 UE4.22 - Fix Texture2dArray crash on Vulkan
#rb none
#jira
#rnx
[FYI] Mark.Satterthwaite

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4984286 in //UE4/Release-4.22/... via CL 4984314
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5034116 by rolando caloca in Dev-VR branch]
2019-02-16 07:50:22 -05:00
anousack kitisa
872a57e3fb Fixed box mapping generation to fit in [0, 1] range (when there's no tiling).
#jira UE-68727

#rb JeanLuc.Corenthin

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4971413 in //UE4/Release-4.22/... via CL 4971422
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032308 by anousack kitisa in Dev-VR branch]
2019-02-16 07:07:25 -05:00
josh adams
ba53727028 - Memory Mapped IO enabled on IOS for Audio (via ini and platform property)
- -nommio on the commandline will disble it for testing
#rb gil.gribb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031108 by josh adams in Dev-VR branch]
2019-02-16 06:02:18 -05:00
lauren ridge
59760236a9 Exclude non-project plugin content from advanced copy
#jira UE-69759
#rb Jamie.Dale

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4963057 in //UE4/Release-4.22/... via CL 4968554
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031081 by lauren ridge in Dev-VR branch]
2019-02-16 05:59:38 -05:00
michael trepka
55e32d12a4 Disable parallel Android texture compression on Mac due to thread safety issues with Qualcomm's Mac TextureConverter
#jira UE-46425
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4962145 in //UE4/Release-4.22/... via CL 4968522
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030970 by michael trepka in Dev-VR branch]
2019-02-16 05:56:00 -05:00
mark satterthwaite
6bf15a6fae 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4956763 in //UE4/Release-4.22/... via CL 4968434
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030946 by mark satterthwaite in Dev-VR branch]
2019-02-16 05:55:12 -05:00
steve robb
7001e90d0b 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4953241 in //UE4/Release-4.22/... via CL 4968360
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5030942 by steve robb in Dev-VR branch]
2019-02-16 05:55:03 -05:00
alexis matte
0dc7fdd34e [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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 4951688 in //UE4/Release-4.22/... via CL 4953006
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5027011 by alexis matte in Dev-VR branch]
2019-02-16 03:55:55 -05:00
ben marsh
eebaeac2c4 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4951506 in //UE4/Release-4.22/... via CL 4951508
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026804 by ben marsh in Dev-VR branch]
2019-02-16 03:51:42 -05:00
lauren ridge
f5b32f7709 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4948430 in //UE4/Release-4.22/... via CL 4948433
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026256 by lauren ridge in Dev-VR branch]
2019-02-16 03:35:33 -05:00
brandon schaefer
e9d99ffcdc Dont add to a container while using iterators. Invalidates the iterators
#jira UE-69646
[CODEREVIEW] Arciel.Rekman
[at]Arciel.Rekman
#rb Arciel.Rekman

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4947629 in //UE4/Release-4.22/... via CL 4947637
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026231 by brandon schaefer in Dev-VR branch]
2019-02-16 03:34:52 -05:00
jack porter
237365f22d 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/... via CL 4947306
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026229 by jack porter in Dev-VR branch]
2019-02-16 03:34:49 -05:00
david harvey
a724e5f0ee 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4930005 via CL 4930006 via CL 4939875 via CL 4939940
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5022610 by david harvey in Dev-VR branch]
2019-02-16 02:39:23 -05:00
nick darnell
67049fc652 Testing - removing a function from the functional testing manager that has no implementation.
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.darnell
#ROBOMERGE-SOURCE: CL 4925685 via CL 4925704 via CL 4925990 via CL 4926017 via CL 4927614 via CL 4935842
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5021778 by nick darnell in Dev-VR branch]
2019-02-16 02:29:01 -05:00
andrew grant
79f6ed56b3 Fixed warnings when workers are not ready yet.
Cut down on number of warnings issued.

#jira UE-66856
#rb na


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4925036 in //UE4/Release-4.22/... via CL 4925037
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017489 by andrew grant in Dev-VR branch]
2019-02-16 01:21:18 -05:00
johan duparc
cbab64ab5c fix build warning for [Compile UE4Editor Linux]
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: johan.duparc
#ROBOMERGE-SOURCE: CL 4924595 in //UE4/Release-4.22/... via CL 4924599
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017428 by johan duparc in Dev-VR branch]
2019-02-16 01:20:41 -05:00
johan duparc
8ec126699c 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: johan.duparc
#ROBOMERGE-SOURCE: CL 4923742 in //UE4/Release-4.22/... via CL 4923746
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017382 by johan duparc in Dev-VR branch]
2019-02-16 01:20:04 -05:00
lauren ridge
875ec03031 Folder advanced copy now works, preserves structure.
#jira UE-69540
#jira UE-69549
#rb Chris.Gagnon

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4923034 in //UE4/Release-4.22/... via CL 4923061
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5016838 by lauren ridge in Dev-VR branch]
2019-02-16 01:15:39 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
2019-02-06 13:27:58 -05:00
matt collins
338f596b4c Enabling Niagara VectorVM CVar.
#jira UE-69189
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: matt.collins
#ROBOMERGE-SOURCE: CL 4902577 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4914355 by matt collins in Dev-VR branch]
2019-02-05 19:06:00 -05:00
nick shin
64627e66bc #jira UE-69414 HTML5 multithreading option in binary builds needs to be set with SourceOnly property
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4894518 in //UE4/Release-4.22/... via CL 4894523
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4909915 by nick shin in Dev-VR branch]
2019-02-05 18:37:14 -05:00
nick shin
141c811b42 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-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4892400 in //UE4/Release-4.22/... via CL 4892402
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4907150 by nick shin in Dev-VR branch]
2019-02-05 18:28:26 -05:00
jamie dale
1a73b90efc Swapped radio button for check button to fix UI glitch
#jira UE-68169
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4892166 in //UE4/Release-4.22/... via CL 4892169
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4907090 by jamie dale in Dev-VR branch]
2019-02-05 18:28:18 -05:00