brandon schaefer
f127c00866
Disable XGE when building on Linux for Android
...
#jira UE-69732
#rb Arciel.Rekman
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 4936860 in //UE4/Release-4.22/... via CL 4936862
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5022140 by brandon schaefer in Dev-VR branch]
2019-02-16 02:33:43 -05:00
nick shin
d798fb2ecc
HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade
...
also, inform developer about the long link time
#jira UE-69632 Multithreaded adds 8.5 minutes to Launch On
#rnx
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4925927 in //UE4/Release-4.22/... via CL 4925930
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5017756 by nick shin in Dev-VR branch]
2019-02-16 01:26:42 -05:00
nick shin
5b77cf659c
HTML5 - emscripten toolchain upgrade 1.38.24
...
epic edits for coolchain upgrade
#jira UEMOB-475 Upgrade UE4 HTML5 toolchain to support multithreading
[RN]
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890171 in //UE4/Release-4.22/... via CL 4890177
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4890181 by nick shin in Dev-VR branch]
2019-02-04 15:04:33 -05:00
nick shin
063b0f86c1
HTML5 - fix log spam
...
replicated to //UE4/Release-4.22
#jira UE-68969 HTML5 logspam when packaging/launching: NOTE[ReadEmscriptenConfigFile]: using EM_CONFIG
#rb none
#rnx
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890103 in //UE4/Release-4.22/... via CL 4890108
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4890114 by nick shin in Dev-VR branch]
2019-02-04 15:01:19 -05:00
marcus wassmer
b259f65406
Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4854570 by marcus wassmer in Dev-VR branch]
2019-01-30 21:24:04 -05:00
Ryan Vance
cf29818a4d
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
Unblocking RoboMerge
[CL 4836190 by Ryan Vance in Dev-VR branch]
2019-01-29 17:41:46 -05:00
Ryan Vance
ab8fb20fd6
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
#lockdown nick.whiting
[CL 4821712 by Ryan Vance in Dev-VR branch]
2019-01-27 21:49:07 -05:00
Ryan Vance
82046cb96e
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
#lockdown nick.whiting
[CL 4819818 by Ryan Vance in Dev-VR branch]
2019-01-25 23:58:19 -05:00
Joe Conley
2c763c1971
Unblocking RoboMerge
...
Unshelved from pending changelist '4792932':
Source=CL 4784913 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 17:07:18 GMT+0000 (Coordinated Universal Time))
ShelfCl=4792932
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp - merging //UE4/Main/Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Render/Devices/DisplayClusterDeviceBase.cpp#7
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.sln#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy.vcxproj.filters - resolving delete from //UE4/Main/Engine/Source/Programs/PixelStreaming/WebRTCProxy/WebRTCProxy...
Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main)
#rb none
[CL 4800808 by Joe Conley in Dev-VR branch]
2019-01-24 12:43:34 -05:00
Joe Conley
c12a880a0c
Unshelved from pending changelist '4791207':
...
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5
#rb Ryan.Vance
[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -05:00
Ryan Vance
a036a5c59c
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
[CL 4759604 by Ryan Vance in Dev-VR branch]
2019-01-20 01:40:56 -05:00
Joe Conley
4e1ecfbaa4
#jira UE-68739 - "//UE4/Dev-VR - Compile UE4Game LuminCompile UE4Game Lumin - 2 Errors"
...
Clang path used to be in quotes, but some part of FileReference in AndroidToolChain was choking on the quotes. Don't put your MLSDK in a directory with spaces for now, I guess.
#rb trivial
[CL 4755639 by Joe Conley in Dev-VR branch]
2019-01-18 16:37:05 -05:00
Ryan Vance
d57bbbcdaf
Merging using MainToDevVR
...
#rb integration
[CL 4748914 by Ryan Vance in Dev-VR branch]
2019-01-17 19:43:28 -05:00
Ryan Vance
7c51ff94af
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
CL 1 of 8
#rb integration
[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
Ryan Vance
ee17a413b9
Lumin device profile update to fix leaking profiles when not running on device.
...
#rb nick.whiting
[CL 4686752 by Ryan Vance in Dev-VR branch]
2019-01-07 17:11:33 -05:00
Joe Conley
6294401ea7
Bring back sym file linkage for debugging Lumin via VS. This is part of a change where we strip the debug symbols from the executable and put them in a separate .sym file. VS picks up the debug symbols directly from this file, helping reduce the size of the mpk significantly. This was reverted along with the other changes to LuminProjectGenerator in CL 4642351.
...
#rb nihav.jain
[CL 4656006 by Joe Conley in Dev-VR branch]
2018-12-12 19:46:18 -05:00
Joe Conley
8de5c67bec
Revert UnrealBuildTool changes from CL-4636504 "Updated ML integration to MLSDK 0.19"
...
It appers to have made it so compiling in Visual Studio cooks and deploys to device. That is not consistent with any other platform.
#rb Ryan.Vance, Ben.Marsh
[CL 4642351 by Joe Conley in Dev-VR branch]
2018-12-07 16:39:11 -05:00
Joe Conley
2deb21e6e2
Magic Leap: Updated minimum SDK support for Magic Leap to 0.19
...
#rb Ryan.Vance
[CL 4639443 by Joe Conley in Dev-VR branch]
2018-12-06 19:42:47 -05:00
Jason Bestimt
ad9d5e5189
Updated ML integration to MLSDK 0.19
...
#CodeReview: ryan.vance
#RB: ryan.vance
[CL 4636504 by Jason Bestimt in Dev-VR branch]
2018-12-06 10:11:06 -05:00
Jason Bestimt
e7ed7cd3ff
Unblock robomerge from Main
...
#RB:none
[CL 4604382 by Jason Bestimt in Dev-VR branch]
2018-11-28 15:05:11 -05:00
marc audy
6ff8f5ad91
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4547701
...
#rb
#rnx
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4547706 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4547711 by marc audy in Dev-VR branch]
2018-11-07 10:45:42 -05:00
marc audy
aa583e8b9b
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863
...
#rb none
#rnx
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4530887 by marc audy in Dev-VR branch]
2018-11-01 09:57:45 -04:00
Jason Bestimt
011680795f
Merging //UE4/Main to Dev-VR-Minimal (//UE4/Dev-VR-Minimal)
...
Unblocking robomerge
#RB:none
[CL 4524004 by Jason Bestimt in Dev-VR branch]
2018-10-30 11:00:11 -04:00
Joe Conley
b42cb3d5cc
ICU was disabled on Lumin because it previously crashed according to the comment in code.
...
Reenabling it, I'm not seeing any immediate problems, seems to work with a simple ICU test.
#rb Jamie.Dale
[CL 4508856 by Joe Conley in Dev-VR branch]
2018-10-25 16:18:03 -04:00
ben marsh
5a701625db
Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4502288 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4502301 by ben marsh in Dev-VR branch]
2018-10-24 11:55:58 -04:00
