Commit Graph

274 Commits

Author SHA1 Message Date
jurre debaare
f77c20b69c Make sure that condition for failing to set up animation sharing instances takes into account whether or not it is an additive one
#rb trivial

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5937539 via CL 5955775 via CL 5955936
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5962045 by jurre debaare in Dev-VR branch]
2019-04-17 21:00:58 -04:00
guillaume guay
f485f320f3 Fix for crash with AnimInstanceSharing, the resource was not flagged as UPROPERTY and got deleted while we still had a native pointer to it, becoming garbage.
Should fix bugs with callstack ending with:
E4Editor-AnimationSharing.dll!UAnimSharingStateInstance::GetInstancedActors(TArray<AActor *,FDefaultAllocator> & Actors) Line 20   C++

#cr jurre.debarre, maxime.mercier
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: guillaume.guay
#ROBOMERGE-SOURCE: CL 5935948 via CL 5936084 via CL 5936126
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5948965 by guillaume guay in Dev-VR branch]
2019-04-17 13:59:24 -04:00
ben marsh
f0c12698c2 Fix inability to open Visual Studio 2019 after creating a project.
#rb none
#jira UE-72230

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

[CL 5755795 by ben marsh in Dev-VR branch]
2019-04-04 21:00:32 -04:00
urias rooney
6d642cc10b Fixed extra synchronous loads in animation sharing
[FYI] bob.tellez

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: urias.rooney
#ROBOMERGE-SOURCE: CL 5635124 via CL 5635125 via CL 5635126 via CL 5639482 via CL 5640746 via CL 5640841
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5642871 by urias rooney in Dev-VR branch]
2019-03-28 21:07:22 -04:00
francis hurteau
37fb7fad4b Adjusted avatar presence hand position to match oculus vr handle
#jira UE-71555
#rb Jamie.Dale

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

[CL 5412327 by francis hurteau in Dev-VR branch]
2019-03-15 06:24:55 -04:00
jurre debaare
4fc6ec36b4 //UE4/Release-4.22 - Run Incremental Automated Tests Win64 - Screenshot 'AnimationSharing_Debug' test failed, Screenshots were different
#jira UE-71460
#rb trivial

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 5396901 in //UE4/Release-4.22/... via CL 5396902
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5410393 by jurre debaare in Dev-VR branch]
2019-03-15 05:34:40 -04:00
francis hurteau
eb814d354c Modified Multi-User presence event to indicate which type of VR device a specific user is using so that avatar presence can use the proper HMD mesh representation
#jira UE-71463
#rb Jamie.Dale

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

[CL 5394037 by francis hurteau in Dev-VR branch]
2019-03-13 20:59:43 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
jamie dale
57a67a9ed6 Fixed hot-reload error that could happen when leaving a MU session
#jira UE-71129
#rb Francis.Hurteau
#rnx

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

[CL 5387480 by jamie dale in Dev-VR branch]
2019-03-13 14:52:39 -04:00
patrick laflamme
7dac10ee5e #jira UE-70863 - Multi-user Plugin does not have a Small Toolbar Icon
- Added a new style brush to concert style using the 40x40 image specifying it is a 20x20 one (automatically resized by slate) used for the concert icons.
  - Added the 'small' brush style alongside the 'normal' one when creating the slate icon for the tool bar.

#rb trival

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

[CL 5273111 by patrick laflamme in Dev-VR branch]
2019-03-01 18:05:20 -05:00
ben marsh
f81856554e Set the program name for UE4-initiated Perforce connections.
#rb none
#jira

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

[CL 5257150 by ben marsh in Dev-VR branch]
2019-02-28 18:38:13 -05:00
lauren ridge
f63554f1fd Fix for SCC dialog popping up when messages should be suppressed when adding actors to checked out levels
#rb Rex.Hill
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: lauren.ridge
#ROBOMERGE-SOURCE: CL 5228442 via CL 5229358 via CL 5233465
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5254377 by lauren ridge in Dev-VR branch]
2019-02-28 18:08:37 -05:00
zach bethel
350b8c2d2e Fixed unsigned overflow of NumRandomizedInstances for animation. Negative values are now bound to 1.
#jira UE-70229
#rb Rolando.Caloca

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: zach.bethel
#ROBOMERGE-SOURCE: CL 5094935 in //UE4/Release-4.22/... via CL 5094939
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5210289 by zach bethel in Dev-VR branch]
2019-02-26 17:39:26 -05:00
tim gautier
30a14fa1fe Fixed line spacing in MultiUser Settings
#rb Jamie.Dale
#jira UE-70331
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: tim.gautier
#ROBOMERGE-SOURCE: CL 5093639 in //UE4/Release-4.22/... via CL 5093641
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5210066 by tim gautier in Dev-VR branch]
2019-02-26 17:34:45 -05:00
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