Commit Graph

260 Commits

Author SHA1 Message Date
jamie dale
e6f8a6312e Fixed some MU presence issues
- Fixed presence avatar settings being empty/incorrect.
 - Fixed base presence types being available for selection in the settings.
 - Fixed presence manager data being susceptible to GC.
 - Fixed presence manager defaulting to VR mode.
 - Removed old presence assets.

#jira UE-70123
#jira UE-70124
#rb none
[CODEREVIEW] Lauren.Ridge
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 5003334 in //UE4/Release-4.22/... via CL 5003355
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5080901 by jamie dale in Dev-VR branch]
2019-02-19 18:52:23 -05:00
jamie dale
ae41cdf089 Fixed new foliage types failing to propagate via MU
They have to have RF_Transactional set when being constructed in order to be caught by the transaction correctly

#jira UE-69757
#rb none
[CODEREVIEW] Michael.Dupuis
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4999508 in //UE4/Release-4.22/... via CL 4999513
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5077322 by jamie dale in Dev-VR branch]
2019-02-19 18:10:58 -05:00
ben marsh
2510e238d9 Fix "Loading Visual Studio" popup not closing when a specific Visual Studio version is selected.
#rb none
#jira UE-69907

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4983208 in //UE4/Release-4.22/... via CL 4983212
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5033560 by ben marsh in Dev-VR branch]
2019-02-16 07:37:05 -05:00
josh engebretson
a9cb635e87 Never overwrite edit with an integrate for same mod time
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 4976351 via CL 4976354 via CL 4977567 via CL 4978249
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5033220 by josh engebretson in Dev-VR branch]
2019-02-16 07:26:00 -05:00
patrick laflamme
47edfaaf90 #jira UE-69749 - Level deleted upon leaving a multi-users session.
When a session is left, the multi-user system performs some clean up to remove 'session only' transactions. If a level was created in a multi-users session and the session left while that world package was dirty, the system would revert those transactions and that process involve deleting/reloading the map. The delete action was unexpectedly recorded by the multi-user system as transaction (map deleted) because the sytem was still hooked to the editor events when this happen. Unregistring the multi-user calls back before performing the clean up fixed the issue.

When a level that was created in a session (and only exists within that session) was the active world when the user left the session, the editor would not unload it. The level could be edited, but could not be saved. Reset the world to the default level template when this situation is detected.

#rb Jamie.Dale
[FYI] Jamie.Dale

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.laflamme
#ROBOMERGE-SOURCE: CL 4973819 in //UE4/Release-4.22/... via CL 4973820
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032493 by patrick laflamme in Dev-VR branch]
2019-02-16 07:11:06 -05:00
rolando caloca
f8ba53014d UE4.22 - Lambda fix
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4934137 in //UE4/Release-4.22/... via CL 4934148
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5021699 by rolando caloca in Dev-VR branch]
2019-02-16 02:27:55 -05:00
rolando caloca
4584acbc2d Unshelved from pending changelist '4932645':
[CODEREVIEW] rolando.caloca,ben.marsh,cristina.riveron,nick.bullard,nick.penwarden

Merge conflict.
rolando.caloca, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp - merging //UE4/Release-4.22/Engine/Plugins/FX/Niagara/Source/Niagara/Private/NiagaraEmitterInstanceBatcher.cpp#2


--------------------------------------
UE4.22 - Deprecate ENQUEUE_UNIQUE_RENDER_COMMAND_THREEPARAMETER
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 4932643 in //UE4/Release-4.22/... via CL 4932685
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5019529 by rolando caloca in Dev-VR branch]
2019-02-16 01:57:06 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
2019-02-06 13:27:58 -05:00
patrick laflamme
35711074ab - Fixed a multi-users bug in the active session panel (the one displaying the connected user and the session history) not displaying all users connected to the session.
- Removed dead code from SActiveSession.h. Removed member functions declared, but not unimplemented.
- Added support to the active session panel to update the local client session info (display name/avatar color) if they changes in real time.
#rb francis.hurteau
#jira UE-69570

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: patrick.laflamme
#ROBOMERGE-SOURCE: CL 4897756 in //UE4/Release-4.22/... via CL 4897758
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912970 by patrick laflamme in Dev-VR branch]
2019-02-05 18:55:38 -05:00
francis hurteau
1e1bba8d6f Added Polys, Model and BrushBuilder to the default whitelist transaction filter in Concert
#rb Jamie.Dale
#jira UESP-1324

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4889936 in //UE4/Release-4.22/... via CL 4889940
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4889962 by francis hurteau in Dev-VR branch]
2019-02-04 14:35:04 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
2019-01-29 19:23:19 -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
marc audy
51bc72840b Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512
#rb
#rnx

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4803543 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4803550 by marc audy in Dev-VR branch]
2019-01-24 15:35:51 -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
c513617392 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4763627 by Ryan Vance in Dev-VR branch]
2019-01-21 15:21:27 -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
Joe Graf
0063f3afda Changed the renderdoc settings object so that the settings are saved properly
#rb: none
#jira: UE-46297

[CL 4613270 by Joe Graf in Dev-VR branch]
2018-11-29 18:21:41 -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
Ryan Vance
90d1459471 #rb none
Unblocking robomerge at 4468496

[CL 4475023 by Ryan Vance in Dev-VR branch]
2018-10-16 14:11:36 -04:00
jason bestimt
f2890ac781 --------------------------------------
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) [at] 4395008
#rb
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-SOURCE: CL 4395058 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4398121 by jason bestimt in Dev-VR branch]
2018-09-26 10:08:47 -04:00
Joe Graf
b718757e69 Made the RenderDocPlugin module init be wrapped inside of WITH_EDITOR since it's not expected to work in a standalone build
#rb: none
#jira: UE-57889

[CL 4332519 by Joe Graf in Dev-VR branch]
2018-08-30 12:29:01 -04:00
Joe Graf
151cb63acd Fixed the CLion source code accessor not wrapping the path in quotes when opening a solution and made it open the CMakeLists.txt file instead of the project file
#rb: none
#jira: UE-54801

[CL 4332514 by Joe Graf in Dev-VR branch]
2018-08-30 12:27:47 -04:00