Commit Graph

5157 Commits

Author SHA1 Message Date
Marcus Wassmer
7d1967d39a Merging //UE4/Dev-Main@8007124 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Prep for stream reparenting

[CL 8039017 by Marcus Wassmer in Dev-Rendering branch]
2019-08-14 13:12:26 -04:00
ben woodhouse
937418f897 PerfReportTool 3.85:
Bulk query improvements:
- Add -beginEvent and -endEvent arguments to generate perf reports only within particular events (e.g skydiving begin/skydiving end)
- Add -summaryTableFilename arg so we can override the summary table filename
[FYI] andrew.ladenberger


#ROBOMERGE-SOURCE: CL 7984408 via CL 7996448
#ROBOMERGE-BOT: (v396-7974030)

[CL 7996657 by ben woodhouse in Main branch]
2019-08-13 14:21:55 -04:00
ben marsh
b91075879c Fix modules in binary-only plugins being compiled for hot reload, which are distributed with ModuleRules.bUsePrecompiled = true.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7990952 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 7991022 by ben marsh in Main branch]
2019-08-13 13:30:54 -04:00
Yujiang Wang
2feadce4ea Add support for volumetric lightmap (VLM) sub level streaming
* Basic assumption: most of the data is contained in small area of volume - which is the case most of the time (1% - 2% of the volume contains 90%+ of the total brick data).
* Only the most detailed level of bricks are streamed - they are assigned to each sub level and streamed in and out with the level. The top level bricks are assigned to the persistent level so that we have something to display (and fewer discontinuities) when the sub levels are streamed out. However runtime dynamic stitching is not implemented so there might be seams in the area of streamed out sub levels - which is probably ok since the level is not needed.
* With SM4 going away, VLM sub level streaming GPU path requires SM5. All platforms having < SM5 will fall back to CPU interpolation path.
* It is recommended to enable bUseFastVoxelization=true and bUseEmbreeInstancing=true in BaseLightmass.ini with this change to speed up VLM generation especially if you have large worlds. Data management has been changed so that we can handle 4GB+ VLM data as long as you have enough video memory - however lighting build time could be not practical so use with care.
* Special notice: we have never supported the workflow of sharing sub levels between multiple worlds, or open each sub level separately to bake, and we're unlikely to support them in the future. It is possible that you happen to get some results, but they are not expected to work.

#rb daniel.wright

[CL 7979421 by Yujiang Wang in Dev-Rendering branch]
2019-08-13 11:06:13 -04:00
josh engebretson
3dd84f6abd Gauntlet: Add support for specifying client, server, editor exec cmds
#rnx


#ROBOMERGE-SOURCE: CL 7952345 via CL 7952406 via CL 7954429 via CL 7955916
#ROBOMERGE-BOT: (v393-7951996)

[CL 7956071 by josh engebretson in Main branch]
2019-08-12 20:04:21 -04:00
justin marcus
900a40be3d Fix android artifacts being saved to the wrong directory.
[at]Josh.Engebretson


#ROBOMERGE-SOURCE: CL 7951960 via CL 7951966 via CL 7951969 via CL 7954680
#ROBOMERGE-BOT: (v393-7951996)

[CL 7954841 by justin marcus in Main branch]
2019-08-12 18:11:12 -04:00
joakim lindqvist
a3699dd5ad UnrealVS - Added more logging when running build batch jobs to catch crash
Potential fix for null dereference when starting batch builds without selecting a job first

#rb none
#jira UE-78539
(ushell-p4-cherrypick of 7950145 by Joakim.Lindqvist)

#ROBOMERGE-SOURCE: CL 7950210 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v392-7949540)

[CL 7950213 by joakim lindqvist in Main branch]
2019-08-12 10:39:50 -04:00
joakim lindqvist
99a20c5f89 Addresed some races in UnrealVS caused by it now loading async.
Fixed Quick Build menu being empty sometimes.
Fixed issue loading .suo settings

Bumped version to 1.56

#jira UE-78446
#rb none

(ushell-p4-cherrypick of 7867809 by Joakim.Lindqvist)

#ROBOMERGE-SOURCE: CL 7950198 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v392-7949540)

[CL 7950199 by joakim lindqvist in Main branch]
2019-08-12 10:38:03 -04:00
ben marsh
19d7c049e7 UGS: Disable support for parallel syncing, due to garbled output from P4.EXE.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7936110 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v391-7919777)

[CL 7936111 by ben marsh in Main branch]
2019-08-09 13:26:11 -04:00
justin marcus
11b919aab1 Fix Gauntlet always recopying obb's to target device. This seem to only happen when running locally and was caused by whitespace not being trimmed from the file names after parsing 'ls' results from ADB. Since this hasn't been seen on the test farm, I'm think this has to be a device specific or maybe a Windows/Linux isse.
[at]Josh.Engebretson


#ROBOMERGE-SOURCE: CL 7883158 via CL 7883183 via CL 7883188 via CL 7915274
#ROBOMERGE-BOT: (v389-7813075)

[CL 7915496 by justin marcus in Main branch]
2019-08-08 23:38:17 -04:00
Juan Canada
7e5f45729d Merging //UE4/Dev-Main@xxxx to Dev-Rendering (//UE4/Dev-Rendering)
#rnx
#rb none

[CL 7904217 by Juan Canada in Dev-Rendering branch]
2019-08-08 16:54:07 -04:00
jason adcock
a8c1ab49db Moving ShooterGame Automation Back In With ShooterGame Project
#RB ryan.gerleve
#JIRA NONE

#ROBOMERGE-SOURCE: CL 7887405 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7887407 by jason adcock in Main branch]
2019-08-08 14:26:50 -04:00
bob tellez
3a8cee55ef #Gauntlet Remove a debugging line I left in
#ROBOMERGE-SOURCE: CL 7860713 via CL 7868828
#ROBOMERGE-BOT: (v389-7813075)

[CL 7870723 by bob tellez in Main branch]
2019-08-08 07:32:42 -04:00
bob tellez
d544da877b #Gauntlet Fix parameter order
[FYI] Andrew.Grant


#ROBOMERGE-SOURCE: CL 7860707 via CL 7868820
#ROBOMERGE-BOT: (v389-7813075)

[CL 7870715 by bob tellez in Main branch]
2019-08-08 07:32:39 -04:00
joakim lindqvist
e594514033 Changed order in which modules are mapped to visual studio projects
It is now Game -> Mod -> Program -> Engine -> Enterprise

This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.

#rb none
[review]-7795550 ben.marsh

(ushell-p4-cherrypick of 7839052 by Joakim.Lindqvist)


Fixed incorrect check for non enigne modules which broke in 7839052.
Also changed local function to a member to fix build issue.

#rb none

#jira UE-76985

#ROBOMERGE-SOURCE: CL 7865223 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865277 by joakim lindqvist in Main branch]
2019-08-08 05:06:56 -04:00
joakim lindqvist
67315195b4 VsCode - Intellisense complaining about incorrect macro definitions
Modified OpenColor header to check if GNUC is defined before using it (as it already does a few lines below). And thus removed the global invalid GNUC define which confuses VsCode.

Fixed up spaces in define that also confused VsCode.

#rb simon.therriault
[fyi] ben.marsh

#jira UE-76985
(ushell-p4-cherrypick of 7288701 by Joakim.Lindqvist)

#ROBOMERGE-SOURCE: CL 7865169 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865209 by joakim lindqvist in Main branch]
2019-08-08 05:06:21 -04:00
josh engebretson
dc962ec853 Fixing boolean check on platform parse
#rnx


#ROBOMERGE-SOURCE: CL 7845368 via CL 7861338
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861388 by josh engebretson in Main branch]
2019-08-08 01:28:54 -04:00
andrew grant
c766272dc7 missed file from last cl
#ROBOMERGE-SOURCE: CL 7844593 via CL 7861320
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861372 by andrew grant in Main branch]
2019-08-08 01:28:04 -04:00
andrew grant
c1adcb70d0 Resolve issue running packaged builds when no project file is available
#rb na


#ROBOMERGE-SOURCE: CL 7844402 via CL 7861228
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861287 by andrew grant in Main branch]
2019-08-08 01:23:21 -04:00
andrew grant
9addea59a4 Fix unresolved project path for Fortnite tests
#ROBOMERGE-SOURCE: CL 7843737 via CL 7861116
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861168 by andrew grant in Main branch]
2019-08-08 01:03:19 -04:00
andrew grant
9462028d66 Fix for packaging warning on Mac. No longer check mono version, just see if msbuild exists. TraceInfo if not,
#jira UE-78524
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7855006 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7855019 by andrew grant in Main branch]
2019-08-07 21:28:08 -04:00
joe conley
09d557b514 #jira UE-78400
#jira UE-78464

Since we are compiling two architectures for HoloLens is causing the second architecture to overwrite the dependency list for the first file. Save them in different locations.

Originally we had a filter to explicitly copy the necessary files, but the filter was too wide. Now that we have this fix, removing the explicit copy filter.

#rb Ben.Marsh

#ROBOMERGE-SOURCE: CL 7846892 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7846932 by joe conley in Main branch]
2019-08-07 18:35:56 -04:00
andrew grant
d0d3313e5a Missed file from 7828884
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7833510 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7833512 by andrew grant in Main branch]
2019-08-06 21:09:38 -04:00
ben marsh
46ebd2be08 Live Coding: Allow building foreign plugins while Live Coding is active.
#rb none
#jira UE-78421

#ROBOMERGE-SOURCE: CL 7820681 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7820694 by ben marsh in Main branch]
2019-08-06 16:18:26 -04:00
andrew grant
6ac2a3bd5e Added -clean option to SyncProject (was lost in refactor)
#jira na
#rb josh.spivey

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7817240 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7819562 by andrew grant in Main branch]
2019-08-06 16:06:27 -04:00