arciel rekman
d5c356b9c0
Linux: harden the UBT makefile generator against .target.cs
...
#rb none
#jira none
[FYI] Brandon.Schaefer
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4950441 in //UE4/Release-4.22/... via CL 4950443
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5026766 by arciel rekman in Dev-VR branch]
2019-02-16 03:50:42 -05:00
david harvey
6aba7c3e99
enable XMA2 streaming on platforms that support it
...
#rb aaron.mcleran
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4935528 via CL 4935535 via CL 4940171 via CL 4941360
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5023420 by david harvey in Dev-VR branch]
2019-02-16 02:52:18 -05:00
david harvey
a0b04cab91
add missing XMA2 streaming define, currently disabled.
...
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 4931727 via CL 4931729 via CL 4939897 via CL 4939959
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 5022678 by david harvey in Dev-VR branch]
2019-02-16 02:40:24 -05:00
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
daniel lamb
397bd45134
[CODEREVIEW] daniel.lamb,jeff.williams
...
Merge conflict.
daniel.lamb, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE
/src/robomerge_ue4_main_01/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs - merging //Fortnite/Dev-EngineMerge/Engine/Source/Programs/UnrealBuildTool/System/ConfigFile.cs#2
--------------------------------------
Create labels for content builds.
#rb William.Ewen
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4869450 via CL 4873808 via CL 4877426
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4877439 by daniel lamb in Dev-VR branch]
2019-02-02 10:11:55 -05:00
ben marsh
d8b6de1e2f
UBT: Prevent DebugGame compile environment from having different ORIGINAL_FILE_NAME macro to the development build environment. This is only needed when compiling resources for binaries. Also prevent the precompiled manifest being written to if it doesn't change.
...
#rb none
#jira UE-69434
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4877079 in //UE4/Release-4.22/... via CL 4877081
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4877087 by ben marsh in Dev-VR branch]
2019-02-01 23:05:09 -05:00
michael kirzinger
2fa95114f0
Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
...
Source: //UE4/Dev-Online 4860295
#rb none
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 4860323 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)
[CL 4860333 by michael kirzinger in Dev-VR branch]
2019-01-31 15:09:49 -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
137d2b8422
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
[CL 4772207 by Ryan Vance in Dev-VR branch]
2019-01-22 15:42:53 -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
ddda57049b
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
...
#rb integration
[CL 4754156 by Ryan Vance in Dev-VR branch]
2019-01-18 15:48:13 -05:00
Ryan Vance
20aac7875a
Integration fallout
...
#rb trivial
[CL 4749217 by Ryan Vance in Dev-VR branch]
2019-01-17 21:20:28 -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
