Commit Graph

136 Commits

Author SHA1 Message Date
Andriy Tylychko
9f65ad43a6 Merging //UE4/Private-3Lateral_Streaming to Main (//UE4/Main)
This mainly covers the new Pixel Streaming plugin version along with minor changes to other parts of the engine:
* removed multiple copies of FThread as it's now a part of Core
* changes to SlateUser required to fix user input in Pixel Streaming

This wasn't formally reviewed due to the size of Pixel Streaming changes, but was skimmed over by Zack Letters before integration

#rb zack.letters

[CL 9486237 by Andriy Tylychko in Main branch]
2019-10-09 08:21:27 -04:00
Ben Marsh
b6039a9873 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 9419420 by Ben Marsh in Dev-Build branch]
2019-10-04 11:20:44 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
Nick Shin
3526d16d5e merge/copyup to parent stream - HTML5 platform extension
#jira UEMOB-482  HTML5 platform as a plug in
#rb josh.adams
#rn

[CL 9306021 by Nick Shin in Dev-Build branch]
2019-09-30 15:13:56 -04:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
2019-09-24 16:13:51 -04:00
ben marsh
6a936ba1b9 Copying //UE4/Dev-RenderPlat-Staging[at]8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 8684840 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v422-8689730)

[CL 8752957 by ben marsh in Dev-Build branch]
2019-09-17 11:58:25 -04:00
Ben Marsh
53e2288d77 Build armv7 and arm64 architectures when packaging Android plugins.
#rb none

[CL 8741522 by Ben Marsh in Dev-Build branch]
2019-09-17 08:06:34 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
chad garyet
cb24cadbfe enable hololens
#jira none
#rb none

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

[CL 7709851 by chad garyet in Main branch]
2019-08-02 16:02:45 -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
chad garyet
3acccbd454 re-enable HTML5
#jira none
#rb none

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

[CL 7626600 by chad garyet in Main branch]
2019-07-25 10:52:38 -04:00
chad garyet
c8193fcceb re-disable hololens
#jira none
#rb none

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

[CL 7477548 by chad garyet in Main branch]
2019-07-22 15:36:23 -04:00
chad garyet
0c5f9d36e3 re-enable hololens in cis
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 7459243 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7459261 by chad garyet in Main branch]
2019-07-19 13:06:02 -04:00
chad garyet
721bebded5 re-enable tvos per request
#jira none
#rb none
[FYI] Josh.Adams, Peter.Sauerbrei, Jack.Porter, ben.marsh
#rnx

#ROBOMERGE-SOURCE: CL 7437703 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7437712 by chad garyet in Main branch]
2019-07-18 10:20:37 -04:00
ben marsh
f4796a54a5 Temporarily disabling HTML5 for installed builds, due to build errors.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7321514 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7321515 by ben marsh in Main branch]
2019-07-16 09:05:23 -04:00
ben marsh
37c8619403 Restore missing Win32 executables from binary releases.
#rb none
#rnx
#jira UE-77139

#ROBOMERGE-SOURCE: CL 7308869 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7308871 by ben marsh in Main branch]
2019-07-15 11:09:23 -04:00
jeff fisher
ba53539174 UE-76509 Packaging for Hololens doesn't work in an Installed build
-fixes hololens arm64 packaging error about mspdbcore.dll, this affected non-installed builds as well
-several other jiras are linked from that one that will still remain for packaging from installed builds
-(actually implemented by joe, reviewed and tested by me)
#rb joe.conley
#jira UE-76509

#ROBOMERGE-SOURCE: CL 7265359 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7265361 by jeff fisher in Main branch]
2019-07-10 14:33:32 -04:00
ben marsh
69d2deb0fc Prevent target platforms being built when -set:HostPlatformOnly=true is specified on the command line.
#rb none
#rnx
#jira UE-76781

#ROBOMERGE-SOURCE: CL 7229281 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7229292 by ben marsh in Main branch]
2019-07-08 13:27:25 -04:00
ben marsh
723598ae20 #jira UE-76260 HTML5 is disabled in installed builds
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 6990738 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6990739 by ben marsh in Main branch]
2019-06-14 13:17:45 -04:00
ben marsh
d58ccb4973 Exclude HTML5 from installed builds for now.
#rb none
#rnx
#jira
[FYI] Nick.Shin, Jack.Porter

#ROBOMERGE-SOURCE: CL 6984576 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6984585 by ben marsh in Main branch]
2019-06-13 19:04:47 -04:00
ben marsh
fa03f04bf7 Disable TVOS in the installed engine build. Please revert once link errors are fixed.
#rb none
#jira
[FYI] Josh.Adams, Peter.Sauerbrei, Jack.Porter
#rnx

#ROBOMERGE-SOURCE: CL 6980529 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 6980538 by ben marsh in Main branch]
2019-06-13 17:09:47 -04:00
ben marsh
947c8c7e17 Fix DDC build failures on Mac due to semicolon in unescaped command line.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 6969781 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6969792 by ben marsh in Main branch]
2019-06-13 11:09:54 -04:00
ben marsh
6f1a4a828c Disable HoloLens from binary builds for now. Lots of errors.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 6968832 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6968834 by ben marsh in Main branch]
2019-06-13 08:29:31 -04:00
ben marsh
c4a5ec878c Fix HoloLens hacks.
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 6968739 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v366-6836689)

[CL 6968740 by ben marsh in Main branch]
2019-06-13 07:51:23 -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