Commit Graph

1029 Commits

Author SHA1 Message Date
Chris Gagnon
6f65d35a7a Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) in prep for copy up
#rb none

[CL 8563299 by Chris Gagnon in Dev-Editor branch]
2019-09-06 19:11:19 -04:00
daniel lamb
bb8ef5ea6f Remove development asset registry from regioncn plugin builds.
[REVIEW] Peter.Sauerbrei


#ROBOMERGE-SOURCE: CL 8506819 via CL 8506820 via CL 8506825 via CL 8508398 via CL 8512214
#ROBOMERGE-BOT: (v406-8472469)

[CL 8512308 by daniel lamb in Main branch]
2019-09-05 18:23:13 -04:00
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Ben Marsh
9da9103e2e UAT: Build both flavors of UHT (with project and without) when packaging, since we don't know whether any UHT plugins are enabled in the project.
#rb none
#rnx

[CL 8384249 by Ben Marsh in Main branch]
2019-08-30 11:52:04 -04:00
sebastien lussier
420db9f28f Allow addition of robomerge tags to the HLOD UAT commands
#jira UE-79459
#rb jc.authier


#ROBOMERGE-SOURCE: CL 8371143 via CL 8371537 via CL 8372600
#ROBOMERGE-BOT: (v402-8361577)

[CL 8372745 by sebastien lussier in Main branch]
2019-08-29 11:48:06 -04:00
Gines Hidalgo
d90bd4346f #jira UETOOL-1721
Enhacement JIRA UETOOL-1721: Removed auto-testing warnings.
#rb none

[CL 8196919 by Gines Hidalgo in Dev-Editor branch]
2019-08-21 17:18:00 -04:00
Ben Marsh
f6564eb124 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 8194620 by Ben Marsh in Dev-Build branch]
2019-08-21 16:28:23 -04:00
andrew grant
3e9c14550d Fixed issue with missing arguments to UHT
#rb mike.beach


#ROBOMERGE-SOURCE: CL 8126941 via CL 8126947 via CL 8132331
#ROBOMERGE-BOT: (v401-8057353)

[CL 8157562 by andrew grant in Main branch]
2019-08-21 09:03:32 -04:00
altair lane
506a7e92ab Fix build error when using the BuildCook process.
#RB Ben.Marsh
[at]David.Hamm, [at]Mike.Beach, [at]Ben.Marsh
#RNX


#ROBOMERGE-SOURCE: CL 8126472 via CL 8126473 via CL 8132112
#ROBOMERGE-BOT: (v401-8057353)

[CL 8157154 by altair lane in Main branch]
2019-08-21 08:57:50 -04:00
andrew grant
f8f35e743b 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: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8008332 in //UE4/Release-4.23/... via CL 8008726
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8048144 by andrew grant in Dev-Build branch]
2019-08-14 23:01:07 -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
Josh Adams
2eb5796bba - Revamped the Platform Extension plugin support to go back to just passing one directory to ReadPluginsFromDirectory now that the directory swap allows it
#rb ben.marsh

[CL 7954514 by Josh Adams in Dev-Build branch]
2019-08-12 17:59:42 -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
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
ben marsh
b876fefefd Fix error compiling editor targets from installed builds.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7713312 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7713313 by ben marsh in Main branch]
2019-08-04 19:48:29 -04:00
chad garyet
1031eb862a - Add architecture flavors for HoloLens
- Force Win10SDK version to 10.0.18362.0
- Fix bug in Finalize that wasn't checking for architecture flavors in platforms not Android
#rb ben.marsh
#jira UE-78303

#ROBOMERGE-SOURCE: CL 7708788 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708789 by chad garyet in Main branch]
2019-08-02 14:08:31 -04:00
andrew grant
6b18803f46 Fixed issue where P4.FileExistsInDepot would return true when the path didn't exist
Bigly refactor of SyncProject script!

* If project file is not on disk will now attempt to find it in P4 (e.g no need to sync a project before you can sync a project).

*Added -projectonly option to skip updating of Engine dir (useful with -force when you've deleted files..)

* Changed default of maxwait to 0 based on new understanding of how this functions.

* Now works when the project is in a different P4 depot than the engine

[at]ben.marsh


#ROBOMERGE-SOURCE: CL 7688001 via CL 7688013 via CL 7688019 via CL 7690526
#ROBOMERGE-BOT: (v383-7686620)

[CL 7690676 by andrew grant in Main branch]
2019-08-01 13:28:12 -04:00
andrew grant
e4a177d2c8 Fixed issue in BuildTarget script with attempting to parse platforms as enums.
Added fallback for projects that don't define Client/Game target scripts

#jira #rb na

#ROBOMERGE-SOURCE: CL 7657569 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7657573 by andrew grant in Main branch]
2019-07-29 20:07:47 -04:00
justin marcus
d8541e9c2a Allow pak rules to only apply to chunked or non-chunked builds.
Fix issue in non-chunked builds that could cause rules to be misapplied - Each staged file should have its pak chunk list.
[REVIEW] [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 7603624 via CL 7603625 via CL 7608778
#ROBOMERGE-BOT: (v372-7473910)

[CL 7608919 by justin marcus in Main branch]
2019-07-24 12:15:40 -04:00
justin marcus
6730ead7e1 Append cook platform to PrePak manifest log so that platforms don't stomp each other's logs.
[FYI] [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 7567867 via CL 7576324 via CL 7585574
#ROBOMERGE-BOT: (v372-7473910)

[CL 7606950 by justin marcus in Main branch]
2019-07-24 11:48:36 -04:00
andrew grant
bb2842930b Moved SyncProject script out of notForLicensees, tidied it up a bit, added -build and -open commands
Added BuildTarget script that can builds specified targets for a project
Added OpenEditor utility script

[FYI] ben.marsh


#ROBOMERGE-SOURCE: CL 7553441 via CL 7553450 via CL 7568654
#ROBOMERGE-BOT: (v372-7473910)

[CL 7569064 by andrew grant in Main branch]
2019-07-23 15:25:57 -04:00
bob tellez
924cc49ff7 #UE4 Create the plugin manifest after directories have been remapped
[FYI] Ben.Marsh,Matt.Kuhlenschmidt


#ROBOMERGE-SOURCE: CL 7250388 via CL 7262943
#ROBOMERGE-BOT: (v369-7254125)

[CL 7263103 by bob tellez in Main branch]
2019-07-10 13:44:17 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Ben Marsh
f16ba4ade1 Missing files to fix UAT compile errors.
#rb none
#rnx

[CL 6911287 by Ben Marsh in Main branch]
2019-06-10 11:12:43 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00