Commit Graph

3162 Commits

Author SHA1 Message Date
ben zeigler
ab23362a2b #jira UE-69912 Fix crashes in ToggleDebugCamera if the selected actor was destroyed/modified while active by exposing object properties to the GC
Remove old ShowSelectedLightmap debug command as it was unsafe and not publicly exposed
#rb michael.noland

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

[CL 5048008 by ben zeigler in Main branch]
2019-02-18 15:48:00 -05:00
mark satterthwaite
11d042e5cf Compile out all support for Metal tessellation shaders from the MetalRHI runtime & remove all vestigial references to geometry shaders using the new pre-processor flags. This resizes all the various arrays to eliminate unused entries which were previously SF_NumFrequencies in size.
[FYI] Marcus.Wassmer, rolando.caloca, peter.sauerbrei
#rb none


#ROBOMERGE-OWNER: mark.satterthwaite
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5010458 via CL 5010459 via CL 5013401

[CL 5047337 by mark satterthwaite in Main branch]
2019-02-18 15:20:11 -05:00
gil gribb
57d43aefcc UE4 - Moved mapped ubulk files to .m.ubulk so that they can be aligned and not compressed without affecting other bulk data such as textures.
#rb none


#ROBOMERGE-SOURCE: CL 5010556 via CL 5010559 via CL 5013445

[CL 5037908 by gil gribb in Main branch]
2019-02-18 12:10:33 -05:00
cosmin sulea
1a8c3d35f5 UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

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

[CL 5036544 by cosmin sulea in Main branch]
2019-02-18 05:54:48 -05:00
josh adams
ccb6baf53b - Reenabled encryption on bulk files with memory mapping - and then disallow mapping at runtime
#rb gil.bribb
[FYI] gil.gribb


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4998359 via CL 4998360 via CL 4999252

[CL 5001374 by josh adams in Main branch]
2019-02-14 17:25:52 -05:00
josh adams
165f5d1e45 iOS - Enabled animation memory mapped IO on IOS. Saves 10-20 megs of memory
#rb josh.adams


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 4993025 via CL 4993026 via CL 4995423

[CL 4999718 by josh adams in Main branch]
2019-02-14 17:11:45 -05:00
rolando caloca
b119b7cc3c UE4.22 - Fix Texture2dArray crash on Vulkan
#rb none
#jira
#rnx
[FYI] Mark.Satterthwaite

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

[CL 4984314 by rolando caloca in Main branch]
2019-02-13 13:03:31 -05:00
anousack kitisa
29a2b59faa Fixed box mapping generation to fit in [0, 1] range (when there's no tiling).
#jira UE-68727

#rb JeanLuc.Corenthin

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

[CL 4971422 by anousack kitisa in Main branch]
2019-02-12 11:11:18 -05:00
josh adams
b7f8902fb9 - 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: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812

[CL 4969283 by josh adams in Main branch]
2019-02-12 10:27:29 -05:00
lauren ridge
164ee07148 Exclude non-project plugin content from advanced copy
#jira UE-69759
#rb Jamie.Dale

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

[CL 4968554 by lauren ridge in Main branch]
2019-02-12 09:40:29 -05:00
michael trepka
7648853d22 Disable parallel Android texture compression on Mac due to thread safety issues with Qualcomm's Mac TextureConverter
#jira UE-46425
#rb none

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

[CL 4968522 by michael trepka in Main branch]
2019-02-12 09:40:18 -05:00
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