3 Commits

Author	SHA1	Message	Date
jerome delattre	94d70d4786	Copy from //Tasks/UE4/Partner-vrCluster ... nDisplayLauncher - Removed OpenGL3 RHI option from the launcher #author Andrey.Yamashev #jira UE-66756 #rb simon.tourangeau #ROBOMERGE-OWNER: ryan.vance #ROBOMERGE-AUTHOR: jerome.delattre #ROBOMERGE-SOURCE: CL 4947691 in //UE4/Release-4.22/... via CL 4947693 #ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) [CL 5026232 by jerome delattre in Dev-VR branch]	2019-02-16 03:34:54 -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
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