Commit Graph

3205 Commits

Author SHA1 Message Date
arne schober
a0932295a2 Strip Additional IndexBuffers from resources when not in use, which should save about 1MB when used on mobile.
#RB marcus.Wassmer
#JIRA 0

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: arne.schober
#ROBOMERGE-SOURCE: CL 5053015 in //Fortnite/Release-8.00/... via CL 5063923
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5136162 by arne schober in Dev-Anim branch]
2019-02-22 03:58:30 -05:00
jonas meyer
2f0298fbb5 The files added in ShaderDebugInfo are now put into a unique folder based on the StaticParameters. This allows you to see and compare shaders from multiple permutations.
Also, in the d3d11 compiler, A description of the different parameters are appended at the end, for information
#rb rolando.caloca chris.bunner

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 5061991 via CL 5062517 via CL 5062687
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5135916 by jonas meyer in Dev-Anim branch]
2019-02-22 03:54:07 -05:00
cosmin sulea
2beffd52ea UE-70234 - Error: Failed to connect to deployment server at 127.0.0.1:41000 - DeploymentServer not running
#jira UE-70234
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5062647 in //UE4/Release-4.22/... via CL 5062652
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5135912 by cosmin sulea in Dev-Anim branch]
2019-02-22 03:54:02 -05:00
cosmin sulea
56504bea59 UE-70204 - //UE4/Main 'Build Tools' - Couldn't find parent type for 'MovieScene2DTransformTrack' named 'UMovieScenePropertyTrack'
#jira UE-70204
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5062262 in //UE4/Release-4.22/... via CL 5062265
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5135862 by cosmin sulea in Dev-Anim branch]
2019-02-22 03:49:16 -05:00
simon tovey
3e6297d992 Implementing CL5061473 in main manually to resolve merge issue.
Fix for data interface calls not being stripped correctly.

#jira none
#rb Frank.Fella

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: simon.tovey
#ROBOMERGE-SOURCE: CL 5061780 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5135815 by simon tovey in Dev-Anim branch]
2019-02-22 03:46:38 -05:00
ben zeigler
ffabd5393c #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-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.zeigler
#ROBOMERGE-SOURCE: CL 5048006 in //UE4/Release-4.22/... via CL 5048008
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5129238 by ben zeigler in Dev-Anim branch]
2019-02-22 02:08:09 -05:00
mark satterthwaite
a355cba263 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: lina.halper
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5010458 via CL 5010459 via CL 5013401 via CL 5047337
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5129224 by mark satterthwaite in Dev-Anim branch]
2019-02-22 02:07:55 -05:00
gil gribb
223a91d788 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-OWNER: lina.halper
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 5010556 via CL 5010559 via CL 5013445 via CL 5037908
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5122566 by gil gribb in Dev-Anim branch]
2019-02-22 01:02:07 -05:00
cosmin sulea
652e1658e7 UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5122300 by cosmin sulea in Dev-Anim branch]
2019-02-22 00:59:24 -05:00
josh adams
e94a3775b4 - Reenabled encryption on bulk files with memory mapping - and then disallow mapping at runtime
#rb gil.bribb
[FYI] gil.gribb

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4998359 via CL 4998360 via CL 4999252 via CL 5001374
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5046982 by josh adams in Dev-Anim branch]
2019-02-18 15:08:12 -05:00
josh adams
62b492b77a iOS - Enabled animation memory mapped IO on IOS. Saves 10-20 megs of memory
#rb josh.adams

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 4993025 via CL 4993026 via CL 4995423 via CL 4999718
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5046464 by josh adams in Dev-Anim branch]
2019-02-18 14:54:42 -05:00
rolando caloca
c682bc6d5a UE4.22 - Fix Texture2dArray crash on Vulkan
#rb none
#jira
#rnx
[FYI] Mark.Satterthwaite

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4984286 in //UE4/Release-4.22/... via CL 4984314
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5043744 by rolando caloca in Dev-Anim branch]
2019-02-18 14:17:31 -05:00
anousack kitisa
fa5b5ce4e1 Fixed box mapping generation to fit in [0, 1] range (when there's no tiling).
#jira UE-68727

#rb JeanLuc.Corenthin

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4971413 in //UE4/Release-4.22/... via CL 4971422
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5029920 by anousack kitisa in Dev-Anim branch]
2019-02-16 05:12:23 -05:00
josh adams
a487e89fda - 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: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027870 by josh adams in Dev-Anim branch]
2019-02-16 04:08:25 -05:00
lauren ridge
36b6560930 Exclude non-project plugin content from advanced copy
#jira UE-69759
#rb Jamie.Dale

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4963057 in //UE4/Release-4.22/... via CL 4968554
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027793 by lauren ridge in Dev-Anim branch]
2019-02-16 04:07:27 -05:00
michael trepka
b686e3e148 Disable parallel Android texture compression on Mac due to thread safety issues with Qualcomm's Mac TextureConverter
#jira UE-46425
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4962145 in //UE4/Release-4.22/... via CL 4968522
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027785 by michael trepka in Dev-Anim branch]
2019-02-16 04:06:43 -05:00
mark satterthwaite
d2c90e6d48 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: lina.halper
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4956763 in //UE4/Release-4.22/... via CL 4968434
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027715 by mark satterthwaite in Dev-Anim branch]
2019-02-16 04:05:54 -05:00
steve robb
a33adc91d9 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: lina.halper
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4953241 in //UE4/Release-4.22/... via CL 4968360
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5027711 by steve robb in Dev-Anim branch]
2019-02-16 04:05:46 -05:00
alexis matte
295bf5324b [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: lina.halper
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 4951688 in //UE4/Release-4.22/... via CL 4953006
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5024035 by alexis matte in Dev-Anim branch]
2019-02-16 03:03:25 -05:00
ben marsh
d43b86cd62 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: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4951506 in //UE4/Release-4.22/... via CL 4951508
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5023935 by ben marsh in Dev-Anim branch]
2019-02-16 03:01:39 -05:00
lauren ridge
af00d74720 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: lina.halper
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4948430 in //UE4/Release-4.22/... via CL 4948433
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5023415 by lauren ridge in Dev-Anim branch]
2019-02-16 02:52:16 -05:00
brandon schaefer
1336d930dc 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: lina.halper
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4947629 in //UE4/Release-4.22/... via CL 4947637
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5023355 by brandon schaefer in Dev-Anim branch]
2019-02-16 02:51:36 -05:00
jack porter
595c78b061 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: lina.halper
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/... via CL 4947306
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5023353 by jack porter in Dev-Anim branch]
2019-02-16 02:51:33 -05:00
david harvey
21a44ba54b 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: lina.halper
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4930005 via CL 4930006 via CL 4939875 via CL 4939940
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5021376 by david harvey in Dev-Anim branch]
2019-02-16 02:23:26 -05:00
nick darnell
2917627601 Testing - removing a function from the functional testing manager that has no implementation.
#ROBOMERGE-OWNER: lina.halper
#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: ANIM (Main -> Dev-Anim)

[CL 5021040 by nick darnell in Dev-Anim branch]
2019-02-16 02:17:38 -05:00