Commit Graph

4667 Commits

Author SHA1 Message Date
jules blok
c02e509e0a Escape all paths when generating VS project filter files
#jira UE-71727
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 5439949 in //UE4/Release-4.22/... via CL 5439986
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5443185 by jules blok in Dev-Networking branch]
2019-03-19 01:03:46 -04:00
andrew grant
47dabd0b61 Use case-insensitive comparison for package names
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5435243 via CL 5438956 via CL 5439032
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5441756 by andrew grant in Dev-Networking branch]
2019-03-18 21:14:03 -04:00
andrew grant
86247e36ab null-merge of Android toolchain
Fixed issue with code stripping of frameworks not being restricted to local symbols


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5435138 via CL 5438906 via CL 5438992
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5441671 by andrew grant in Dev-Networking branch]
2019-03-18 21:12:51 -04:00
pete procopio
1ecd75c1b6 Allow dynamic library as target for finalizing Android project
#ue4
#android
#rb Chris.Babcock
[FYI] Chris.Babcock


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: pete.procopio
#ROBOMERGE-SOURCE: CL 5420722 via CL 5427997 via CL 5428139
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5431790 by pete procopio in Dev-Networking branch]
2019-03-18 13:11:22 -04:00
ben marsh
910808460d Remove the CommandUtils.Log function, so we don't shadow the global Log class.
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5418570 via CL 5426900 via CL 5427007
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5430755 by ben marsh in Dev-Networking branch]
2019-03-18 13:01:49 -04:00
jeff fisher
49916d056d Back out changelist 5417701
-This fix breaks the ddc build, which is more important.
#rb build
#jira UE-67120

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 5423419 in //UE4/Release-4.22/... via CL 5423420
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5423534 by jeff fisher in Dev-Networking branch]
2019-03-16 16:58:47 -04:00
sorin gradinaru
673f26c302 UE-71596 iOS packaging error with CloudKit enabled - Provisioning profile <...> doesn't match the entitlements file's values
#jira UE-71596
#iOS
#tvOS
#4.22
#rb Jack.Porter

Moved the entitlements file generation from preinit to postbuild, so we can write the correct iCloud container settings

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5419244 in //UE4/Release-4.22/... via CL 5419247
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5421581 by sorin gradinaru in Dev-Networking branch]
2019-03-15 17:03:10 -04:00
jeff fisher
bbe5f8c811 UE-67120 Editor crash on startup after enabling Morpheus plugin...
UE-67297 ShaderCompiler crash when opening the editor with Morpheus plugin and project setting enabled
-Moved this shader file out of platform shader directory into the  plugin shaders (it isn't actually for use on that platform, its used in the editor).  Sadly we still need to use it from engine code if the shader file exists because a postprocesspass cannot be defined in a plugin and I couldn't find a way to pull the shader from the plugin and use it in the pass so I had to hardcode the shader path mapping for this plugin in launchengineloop.  A rendering refactor is coming along that will make postprocess passes more like other passes, so it makes sense to defer refactoring this until after that.
#jira UE-67120 UE-67297
#rb Ryan.Vance

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 5417701 in //UE4/Release-4.22/... via CL 5417707
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5420956 by jeff fisher in Dev-Networking branch]
2019-03-15 16:59:23 -04:00
nick shin
ddea94c735 HTML5 - FrontEnd COTF - seems proxy port is no longer used/needed
#jira UE-64628  HTML5 Quick Launch fails to connect due to incorrect port
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 5415267 in //UE4/Release-4.22/... via CL 5415269
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5418808 by nick shin in Dev-Networking branch]
2019-03-15 13:12:51 -04:00
stuart hill
e1c4a11f9b Prevent the Pixel Streaming Demo from trying to change the resolution to 4K when the user hasn't added the -NvEncH264ConfigLevel=NV_ENC_LEVEL_H264_52 UE4 command line option to UE4.
#rb Alistair.White
#rnx
#jira UE-70299

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: stuart.hill
#ROBOMERGE-SOURCE: CL 5414137 in //UE4/Release-4.22/... via CL 5414141
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5418791 by stuart hill in Dev-Networking branch]
2019-03-15 13:12:39 -04:00
cosmin sulea
0c2722c1e4 UE-67484 - tvOS LaunchOn error: IBCocoaTouchImageCatalogTool[7050:421228] CoreThemeDefinition: Unable to get image stack data for file
#jira UE-67484
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5412656 in //UE4/Release-4.22/... via CL 5412657
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5418764 by cosmin sulea in Dev-Networking branch]
2019-03-15 13:11:54 -04:00
ben marsh
d1b5b28bc4 Fix issues related to hot-reload and LiveCoding co-existing.
* Removed code to invalidate makefiles when adding new source files. UBT should be reliable enough to make this determination itself nowadays, and ignored -invalidatemakefilesonly argument was causing modules to be recompiled.
* Fixed incorrect config section name when determining whether to allow hot reload from IDE. Now prevents hot reload from IDE when live coding is enabled.
* Added error message when trying to add a new class with Live Coding enabled.
* Added error messages when trying to start Live Coding after a hot reload has taken place.
* Added error messages when trying to hot reload with Live Coding enabled.

#jira UE-71253
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5403464 in //UE4/Release-4.22/... via CL 5403485
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5417897 by ben marsh in Dev-Networking branch]
2019-03-15 12:57:01 -04:00
jeff williams
c23e05b7f0 Allow iterate shared cooked builds to re-stage non-UFS files over the base build
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeff.williams
#ROBOMERGE-SOURCE: CL 5400125 via CL 5401608 via CL 5403246
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5417816 by jeff williams in Dev-Networking branch]
2019-03-15 12:56:27 -04:00
jeff williams
046841c32e Allow for selection of shared cooked builds within the most recent code CL
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeff.williams
#ROBOMERGE-SOURCE: CL 5400074 via CL 5401504 via CL 5402283
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5417776 by jeff williams in Dev-Networking branch]
2019-03-15 12:56:07 -04:00
clayton langford
b8c9b29214 Added ArtifactPath field to UnrealTestNode so that tests keep a reference to this file path. Create this path string within StartTest instead of StopTest so that it is populated sooner.
#rnx
#rb Andrew.Grant

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: clayton.langford
#ROBOMERGE-SOURCE: CL 5399241 via CL 5399252 via CL 5400656 via CL 5400817
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5417655 by clayton langford in Dev-Networking branch]
2019-03-15 12:50:32 -04:00
cosmin sulea
0969122882 UE-70766 - iOS remote build unloads the Login Keychain on the remote Mac - additional
#jira UE-70766
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5397216 in //UE4/Release-4.22/... via CL 5397218
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5416915 by cosmin sulea in Dev-Networking branch]
2019-03-15 12:40:39 -04:00
ben marsh
25af8d862d UBT: Fix generated config files not being read by UBT, or being considered when determining if makefiles are out of date.
#rb none
#jira UE-71501

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5392870 in //UE4/Release-4.22/... via CL 5392891
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5416014 by ben marsh in Dev-Networking branch]
2019-03-15 12:29:03 -04:00
cosmin sulea
8158613257 UE-70358 - Failure to sign when packaging for iOS Distribution when using Remote Compile from a code project on Windows
#jira UE-70358
#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5382950 in //UE4/Release-4.22/... via CL 5383321
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5415572 by cosmin sulea in Dev-Networking branch]
2019-03-15 12:02:29 -04:00
michael trepka
21f2813c00 UBT: Fixed Copy Action on Mac and Linux for paths containing space character
#jira UE-71448
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 5382629 in //UE4/Release-4.22/... via CL 5383068
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5415568 by michael trepka in Dev-Networking branch]
2019-03-15 12:02:22 -04:00
bob tellez
00b1798655 Unshelved from Hongyi.Yu
Fix numbering for patch paks when skipping a patch tier on new files

[FYI] Hongyi.Yu

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: Hongyi.Yu
#ROBOMERGE-SOURCE: CL 5377129 via CL 5377234 via CL 5378975
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406696 by bob tellez in Dev-Networking branch]
2019-03-14 19:54:07 -04:00
josh engebretson
e0ff72493c Gauntlet: release devices back to pool once artifacts have been saved
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 5371348 via CL 5371350 via CL 5375533 via CL 5378401
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406539 by josh engebretson in Dev-Networking branch]
2019-03-14 19:48:33 -04:00
chris babcock
41b1b043be Fix issue with changelist as store version update ordering
#ue4
#android
#rb Josh.Adams


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5370883 via CL 5370885 via CL 5374861 via CL 5378024
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5406457 by chris babcock in Dev-Networking branch]
2019-03-14 19:45:40 -04:00
cosmin sulea
4ee46d5350 Merge conflict from Release-4.22 to UE4/main
#jira UE-70734
#rb Jack.Porter
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5368380 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5405843 by cosmin sulea in Dev-Networking branch]
2019-03-14 19:25:06 -04:00
ben marsh
2657778a26 Add some FileReference/DirectoryReference overloads to CommandUtils.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5357972 in //UE4/Release-4.22/... via CL 5367811
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5405690 by ben marsh in Dev-Networking branch]
2019-03-14 19:08:45 -04:00
ben marsh
d61a5bb8a8 LiveCoding: Wait for other processes to finish when triggering a compile. Allows live coding to work with multiple editors open.
#rb none
#jira UE-71287

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5354077 in //UE4/Release-4.22/... via CL 5367786
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5405521 by ben marsh in Dev-Networking branch]
2019-03-14 19:06:24 -04:00