Jake Leonard
6f71e0f438
Fixing iOS build warnings from robomerge
...
#rnx
#rb: none
#Jira: none
[CL 5151685 by Jake Leonard in Dev-Networking branch]
2019-02-22 15:03:48 -05:00
ethan geller
9e660d1e05
Fix for ensure on cook for Switch/iOS/Android.
...
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 5102439 via CL 5103044 via CL 5103074
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5139817 by ethan geller in Dev-Networking branch]
2019-02-22 06:03:36 -05:00
rolando caloca
6f83aa062a
UE4.22 - Fix Lumin shaders format
...
#rnx
#rb none
#jira UE-UE-70308
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5095354 in //UE4/Release-4.22/... via CL 5095358
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5138269 by rolando caloca in Dev-Networking branch]
2019-02-22 05:26:08 -05:00
cosmin sulea
9bca4a4a22
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: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5089041 in //UE4/Release-4.22/... via CL 5089042
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5137629 by cosmin sulea in Dev-Networking branch]
2019-02-22 04:51:08 -05:00
jamie dale
680920804b
Allow game localization targets to gather engine sources from an out-of-source project
...
The localization pipeline locks the relative paths used by a target to either the engine or project root (depending on the target type), however the UE4 engine isn't localized into many languages, so project targets often have to override some of the engine localization to support their additional languages. For in-source builds, this was possible by using a project relative path to the engine directory (which was in a fixed location), however for any out-of-source projects (such as those in the "Unreal Projects" directory) there was no way to do this in a portable way.
This change adds a "path root" to every include and exclude path, which can be set to "Auto" (the default, which detects the root based on the target type), "Engine" (to force the path to be resolved relative to the engine root), or "Project" (to force the path to be resolved relative to the project root). This allows out-of-source projects to specify paths relative to the engine in a portable way.
#jira UE-70296
#rb Lauren.Ridge
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 5073204 in //UE4/Release-4.22/... via CL 5073205
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5137209 by jamie dale in Dev-Networking branch]
2019-02-22 04:19:51 -05:00
arne schober
55c9dd8235
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: ryan.gerleve
#ROBOMERGE-AUTHOR: arne.schober
#ROBOMERGE-SOURCE: CL 5053015 in //Fortnite/Release-8.00/... via CL 5063923
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5136095 by arne schober in Dev-Networking branch]
2019-02-22 03:57:20 -05:00
jonas meyer
f57a0bbf3f
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: ryan.gerleve
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 5061991 via CL 5062517 via CL 5062687
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5135879 by jonas meyer in Dev-Networking branch]
2019-02-22 03:52:35 -05:00
cosmin sulea
2f8e19fc28
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: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5062647 in //UE4/Release-4.22/... via CL 5062652
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5135877 by cosmin sulea in Dev-Networking branch]
2019-02-22 03:52:30 -05:00
cosmin sulea
ccc093927b
UE-70204 - //UE4/Main 'Build Tools' - Couldn't find parent type for 'MovieScene2DTransformTrack' named 'UMovieScenePropertyTrack'
...
#jira UE-70204
#rb none
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5062262 in //UE4/Release-4.22/... via CL 5062265
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5135844 by cosmin sulea in Dev-Networking branch]
2019-02-22 03:47:59 -05:00
simon tovey
b1df14812f
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: ryan.gerleve
#ROBOMERGE-AUTHOR: simon.tovey
#ROBOMERGE-SOURCE: CL 5061780 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5135768 by simon tovey in Dev-Networking branch]
2019-02-22 03:44:53 -05:00
ben zeigler
ddb31795df
#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: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.zeigler
#ROBOMERGE-SOURCE: CL 5048006 in //UE4/Release-4.22/... via CL 5048008
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5129382 by ben zeigler in Dev-Networking branch]
2019-02-22 02:09:37 -05:00
mark satterthwaite
522822c40d
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: ryan.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5010458 via CL 5010459 via CL 5013401 via CL 5047337
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5129357 by mark satterthwaite in Dev-Networking branch]
2019-02-22 02:09:27 -05:00
gil gribb
8a56af6832
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: ryan.gerleve
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 5010556 via CL 5010559 via CL 5013445 via CL 5037908
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5122546 by gil gribb in Dev-Networking branch]
2019-02-22 01:01:54 -05:00
cosmin sulea
9d2343c6bb
UE-63767 - iOS Device Output Log console does not work
...
#jira UE-63767
#rb Jack.Porter
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5122266 by cosmin sulea in Dev-Networking branch]
2019-02-22 00:59:10 -05:00
josh adams
faf3c16242
- Reenabled encryption on bulk files with memory mapping - and then disallow mapping at runtime
...
#rb gil.bribb
[FYI] gil.gribb
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4998359 via CL 4998360 via CL 4999252 via CL 5001374
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5084887 by josh adams in Dev-Networking branch]
2019-02-19 19:37:48 -05:00
josh adams
44ef397721
iOS - Enabled animation memory mapped IO on IOS. Saves 10-20 megs of memory
...
#rb josh.adams
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 4993025 via CL 4993026 via CL 4995423 via CL 4999718
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5083260 by josh adams in Dev-Networking branch]
2019-02-19 19:18:23 -05:00
rolando caloca
f8acdb5e89
UE4.22 - Fix Texture2dArray crash on Vulkan
...
#rb none
#jira
#rnx
[FYI] Mark.Satterthwaite
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4984286 in //UE4/Release-4.22/... via CL 4984314
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5079682 by rolando caloca in Dev-Networking branch]
2019-02-19 18:36:18 -05:00
anousack kitisa
4ea0e1afd7
Fixed box mapping generation to fit in [0, 1] range (when there's no tiling).
...
#jira UE-68727
#rb JeanLuc.Corenthin
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: anousack.kitisa
#ROBOMERGE-SOURCE: CL 4971413 in //UE4/Release-4.22/... via CL 4971422
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5076743 by anousack kitisa in Dev-Networking branch]
2019-02-19 18:04:16 -05:00
josh adams
c510e3cc7b
- 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.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5074095 by josh adams in Dev-Networking branch]
2019-02-19 17:29:04 -05:00
lauren ridge
29a6116305
Exclude non-project plugin content from advanced copy
...
#jira UE-69759
#rb Jamie.Dale
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 4963057 in //UE4/Release-4.22/... via CL 4968554
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5073932 by lauren ridge in Dev-Networking branch]
2019-02-19 17:26:23 -05:00
michael trepka
15c6b59c37
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.gerleve
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 4962145 in //UE4/Release-4.22/... via CL 4968522
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5073886 by michael trepka in Dev-Networking branch]
2019-02-19 17:26:09 -05:00
mark satterthwaite
1b84b052a1
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.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 4956763 in //UE4/Release-4.22/... via CL 4968434
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5073763 by mark satterthwaite in Dev-Networking branch]
2019-02-19 17:25:23 -05:00
steve robb
d480ccefa7
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.gerleve
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4953241 in //UE4/Release-4.22/... via CL 4968360
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5073742 by steve robb in Dev-Networking branch]
2019-02-19 17:25:15 -05:00
alexis matte
39344d035e
[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.gerleve
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 4951688 in //UE4/Release-4.22/... via CL 4953006
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5072154 by alexis matte in Dev-Networking branch]
2019-02-19 16:34:29 -05:00
ben marsh
f462a5bad1
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.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4951506 in //UE4/Release-4.22/... via CL 4951508
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5071895 by ben marsh in Dev-Networking branch]
2019-02-19 16:29:54 -05:00