Commit Graph

7207 Commits

Author SHA1 Message Date
jack porter 79aa064b79 Set minimum iOS version to 11
#jira UE-78649
#rb Dmitriy.Dyomin
[FYI] Peter.Sauerbrei

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

[CL 8019260 by jack porter in Main branch]
2019-08-13 23:43:41 -04:00
ben woodhouse 40950dea84 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 7984408 via CL 7996448 via CL 7996657
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v396-7974030)

[CL 8016680 by ben woodhouse in Dev-Core branch]
2019-08-13 22:40:07 -04:00
ben marsh 837558ef50 Fix modules in binary-only plugins being compiled for hot reload, which are distributed with ModuleRules.bUsePrecompiled = true.
#rb none
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7990952 in //UE4/Release-4.23/... via CL 7991022
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v396-7974030)

[CL 8016429 by ben marsh in Dev-Core branch]
2019-08-13 22:36:13 -04:00
andrew grant 47a03942a9 Editgrated latest SyncProject script from FN as part of UE-78832, UE-78826, and resolved issues with omitted / dangerous arguments.
Project arg is now optional and will simply sync the engine.
Passing -CL=0 will now require the -force argument before syncing files out of the workspace.
Fixed issue with deep samples (e.g AREnvProbe) not being discovered by FindProjectFileFromName
Added NativeProjects.ClearCache option for the case when syncing a project from P4 that isn't yet on disk

Fixed issue with P4.FileExistsInDepot returning true if passed a path that isn't in the users client view. Relates to UE-78832 but not the entire fix
Fixed issue with BuildEditor not working without a project arg.
Fixed issue building projects that don't have source

[CODEREVIEW] ben.marsh
#jira UE-78832, UE-78826
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8008332 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 8008726 by andrew grant in Main branch]
2019-08-13 16:24:19 -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
justin marcus 302c7cb62d 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-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 7883158 via CL 7883183 via CL 7883188 via CL 7915274 via CL 7915496
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7977158 by justin marcus in Dev-Build branch]
2019-08-13 10:43:32 -04:00
jason adcock 51ac24e427 Moving ShooterGame Automation Back In With ShooterGame Project
#RB ryan.gerleve
#JIRA NONE

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jason.adcock
#ROBOMERGE-SOURCE: CL 7887405 in //UE4/Release-4.23/... via CL 7887407
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7976580 by jason adcock in Dev-Build branch]
2019-08-13 10:36:49 -04:00
Ben Marsh 8acce72589 Remove log spam.
#rb none
#rnx

[CL 7976339 by Ben Marsh in Dev-Build branch]
2019-08-13 10:33:59 -04:00
bob tellez e3e92b46ab #Gauntlet Remove a debugging line I left in
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7860713 via CL 7868828 via CL 7870723
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7975950 by bob tellez in Dev-Build branch]
2019-08-13 10:28:09 -04:00
bob tellez 5daca59cd7 #Gauntlet Fix parameter order
[FYI] Andrew.Grant

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7860707 via CL 7868820 via CL 7870715
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v396-7974030)

[CL 7975946 by bob tellez in Dev-Build branch]
2019-08-13 10:28:07 -04:00
Ben Marsh 3b3593ca02 Fix copyright warning in CIS.
#rb none
#rnx

[CL 7975807 by Ben Marsh in Dev-Build branch]
2019-08-13 10:24:03 -04:00
josh engebretson 1faa7f65dd Gauntlet: Add support for specifying client, server, editor exec cmds
#rnx

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 7952345 via CL 7952406 via CL 7954429 via CL 7955916 via CL 7956071
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7972834 by josh engebretson in Dev-Core branch]
2019-08-13 05:04:53 -04:00
justin marcus c445c2d9e7 Fix android artifacts being saved to the wrong directory.
[at]Josh.Engebretson

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 7951960 via CL 7951966 via CL 7951969 via CL 7954680 via CL 7954841
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7972666 by justin marcus in Dev-Core branch]
2019-08-13 04:54:41 -04:00
joakim lindqvist 0c82619276 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joakim.lindqvist
#ROBOMERGE-SOURCE: CL 7950210 in //UE4/Release-4.23/... via CL 7950213
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7972307 by joakim lindqvist in Dev-Core branch]
2019-08-13 04:34:52 -04:00
joakim lindqvist e9c434a4e5 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joakim.lindqvist
#ROBOMERGE-SOURCE: CL 7950198 in //UE4/Release-4.23/... via CL 7950199
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7972306 by joakim lindqvist in Dev-Core branch]
2019-08-13 04:34:49 -04:00
ben marsh df1d9de0fb UGS: Disable support for parallel syncing, due to garbled output from P4.EXE.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7936110 in //UE4/Release-4.23/... via CL 7936111
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7968520 by ben marsh in Dev-Core branch]
2019-08-13 00:05:25 -04:00
justin marcus cb0d52a43c 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 7883158 via CL 7883183 via CL 7883188 via CL 7915274 via CL 7915496
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7965586 by justin marcus in Dev-Core branch]
2019-08-12 23:35:12 -04:00
jason adcock b65062b363 Moving ShooterGame Automation Back In With ShooterGame Project
#RB ryan.gerleve
#JIRA NONE

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jason.adcock
#ROBOMERGE-SOURCE: CL 7887405 in //UE4/Release-4.23/... via CL 7887407
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7964392 by jason adcock in Dev-Core branch]
2019-08-12 23:29:34 -04:00
bob tellez 965c1e211b #Gauntlet Remove a debugging line I left in
#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7860713 via CL 7868828 via CL 7870723
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7962884 by bob tellez in Dev-Core branch]
2019-08-12 23:20:51 -04:00
bob tellez 5a608d94d1 #Gauntlet Fix parameter order
[FYI] Andrew.Grant

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7860707 via CL 7868820 via CL 7870715
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7962875 by bob tellez in Dev-Core branch]
2019-08-12 23:20:49 -04:00
joakim lindqvist 1af628486b 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joakim.lindqvist
#ROBOMERGE-SOURCE: CL 7865223 in //UE4/Release-4.23/... via CL 7865277
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7961255 by joakim lindqvist in Dev-Core branch]
2019-08-12 23:14:10 -04:00
joakim lindqvist c508a47a82 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joakim.lindqvist
#ROBOMERGE-SOURCE: CL 7865169 in //UE4/Release-4.23/... via CL 7865209
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7961156 by joakim lindqvist in Dev-Core branch]
2019-08-12 23:13:54 -04:00
josh engebretson 2edc98d4aa Fixing boolean check on platform parse
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 7845368 via CL 7861338 via CL 7861388
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v393-7951996)

[CL 7960536 by josh engebretson in Dev-Build branch]
2019-08-12 23:11:49 -04:00
josh engebretson 5c7a62d38f Fixing boolean check on platform parse
#rnx

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 7845368 via CL 7861338 via CL 7861388
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v393-7951996)

[CL 7960533 by josh engebretson in Dev-Core branch]
2019-08-12 23:11:49 -04:00