Commit Graph

25 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
rolando caloca
f6cd88c157 UE5 - Remove platform
#rb Steve.Smith
[FYI] Jules.Blok, Ryan.Durand, Ben.Marsh

#ROBOMERGE-SOURCE: CL 17295935 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17295945 by rolando caloca in ue5-release-engine-test branch]
2021-08-24 19:28:38 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
fieldsJacksonG
c503754b1a PR #6815: Remove duplicate TrackingToWorldTransform in HoloLens Hand Joints (Contributed by fieldsJacksonG)
#rb steve.smith
#jira UE-91376
#lockdown nick.whiting

#ROBOMERGE-SOURCE: CL 12500444 in //UE4/Release-4.25/... via CL 12500451 via CL 12500459
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12500467 by steve smith in Main branch]
2020-03-31 15:56:17 -04:00
steve smith
f747e2dc9e Fix build break from merged Microsoft submission for Hololens hand-tracking
#rb trivial
#jira none

#ROBOMERGE-SOURCE: CL 11591245 in //UE4/Release-4.25/... via CL 11591251
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11591262 by steve smith in Main branch]
2020-02-24 17:03:45 -05:00
fieldsJacksonG
16d7603df0 Unshelved from pending changelist '11191641':
PR #6642: Rotate hand joint transforms to match UE convention (Contributed by fieldsJacksonG)

#rb steve.smith
#jira UE-87833

#ROBOMERGE-SOURCE: CL 11591078 in //UE4/Release-4.25/... via CL 11591086
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11591094 by steve smith in Main branch]
2020-02-24 16:48:21 -05:00
steve smith
518fa4e14c WMR input simulation cleanup and fixes (provided by Microsoft): Additional features and fixes for WMR input simulation support
#rb steve.smith
#jira none

#ROBOMERGE-SOURCE: CL 11590996 in //UE4/Release-4.25/... via CL 11591000
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11591009 by steve smith in Main branch]
2020-02-24 16:39:31 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
marc audy
dbcf07a558 Use new inline versions of substring functions
Fix up nearby cases where ESearchCase::CaseSensitive should have been used
#jira
#rnx
#rb

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10309793 via CL 10309818
#ROBOMERGE-BOT: (v593-10286020)

[CL 10309932 by marc audy in Main branch]
2019-11-19 13:27:07 -05:00
jeff fisher
31dcd28b35 Integrating some fixes from partner-microsoft-xr
-specifically cl 9616691 9630939 9743710
-Fixes UEVR-1502 Hololens 2 - Remoting AR Session is not automatically stopped when vrpreview session ends.
-Ups remoting app version compatibility to 2.0.12.0
-fixes bugs with gestures
-fixes some threading problems
-implements device connected/disconnected hooks for remoting
#jira UEVR-1502
#rb Joe.Conley Jackson.Fields

#ROBOMERGE-OWNER: jeff.fisher
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 9843215 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v548-9842178)

[CL 9843351 by jeff fisher in Main branch]
2019-10-25 16:04:52 -04:00
jeff fisher
14822a27ea Change: 8926470
UE-79885 HL2 CL integrations
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) Change: 8926470
-Update GetHandJointTransform to world space.
#rb Ryan.Vance
#lockdown nick.penwarden
#jira UE-79885

#ROBOMERGE-SOURCE: CL 8932343 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v435-8929571)

[CL 8932348 by jeff fisher in Main branch]
2019-09-20 14:00:52 -04:00
jeff fisher
0d0e1e945d UE-79885 HL2 CL integrations
-Completed fix for "IsTracked" with HL2 hand tracking.
#rb Ryan.Vance
#jira UE-79885
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8627915 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v409-8614070)

[CL 8627923 by jeff fisher in Main branch]
2019-09-10 17:41:18 -04:00
jeff fisher
f583fbfec7 UE-79885 HL2 CL integrations
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) 8322424
8322424 - Plumb WMR controller tracking data to IsTracked BP function - this is the two .cpp files changes
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) 8513053
8513053 - Update HL2 remoting to 2.0.8.0 - this changes some of the source binaries for remoting.
#rb Ryan.Vance
#lockdown nick.penwarden
#jira UE-79885

#ROBOMERGE-SOURCE: CL 8621191 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v409-8614070)

[CL 8621201 by jeff fisher in Main branch]
2019-09-10 15:30:59 -04:00
jeff fisher
5e79440234 UE-79885 HL2 CL integrations
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) Change: 7668425
Remove Eye Tracking Origin offset in favor of changing the tracking origin at runtime in the game-level if necessary.  The HoloLens camera should be eye tracking and content should be correctly rendered relative to the camera's starting position.
Implement HasValidTrackingPosition()
Update ipd every frame now that calibration can be triggered at any time
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) Change: 8512891
Hand Fixes:
1. Correct Hand Joint tracking state for GetHandJointTransform
2. Plumb grasp through remoting
#rb Ryan.Vance
#lockdown nick.penwarden
#jira UE-79885

#ROBOMERGE-SOURCE: CL 8573569 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v407-8568993)

[CL 8573574 by jeff fisher in Main branch]
2019-09-09 12:58:42 -04:00
patrick boutot
f12fe04f27 Back out changelist 7790661
Back out changelist 7822943
Add deprecation path for ILiveLinkSource::IsSourceStillValid. Add a new function IsSourceValid
#rb none
#jira UE-78470

#ROBOMERGE-SOURCE: CL 7839258 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7839261 by patrick boutot in Main branch]
2019-08-07 07:12:48 -04:00
patrick boutot
09846a59c4 Add deprecation path for ILiveLinkSource::IsSourceStillValid. Add a new function IsSourceValid
#jira UE-76056
#rb simon.therriault

#ROBOMERGE-SOURCE: CL 7790661 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v388-7785529)

[CL 7793081 by patrick boutot in Main branch]
2019-08-06 11:11:42 -04:00
jeff fisher
216a2f6748 UEVR-1448 WMR/Hololens Remoting AR support
-A custom build step now generates the header MixedRealityInteropBuildInfo.h which has a define like "#define WINDOWS_MIXED_REALITY_INTEROP__WINDOWS_TARGET_PLATFORM_VERSION 10.0.18362.0" with the version being whatever $WindowsTargetPlatformVersion is for the MixedRelaityInterop project build.  This will allow the UE4 build process to respond to the WindowsSDK that the interop was built with.
-WindowsMixedRealityAvailability.h sets #defines based on sdk and platform so that we can enable or disable features in UE4.
-Fixed hand tracking so that it does not rely on a motion contrller pumping the hand traking data update of the interop.
-Gesture callbacks now feed a queue which dispatches the controller events from the game thread.
-Turned some asserts that could be triggered by dubious blueprint setup into warnings.
-The HololensAR plugin is now functional when remoting and on WMR headsets.  HololensRemoting now supports all the AR features, except the passthrough camera which is currently unsupported by microsoft.  WMR Supports only anchors and the anchor store.

#rb jason.bestimt
#jira UEVR-1448

#ROBOMERGE-SOURCE: CL 7641374 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7641379 by jeff fisher in Main branch]
2019-07-26 15:20:42 -04:00
simon therriault
259833d70c - Fixing WindowsMixedRealityHandTracking remap asset for new api
#rb jeff.fisher
#jira UE-77030

#ROBOMERGE-SOURCE: CL 7294359 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v370-7290619)

[CL 7294365 by simon therriault in Main branch]
2019-07-12 16:36:29 -04:00
Jeff Fisher
ea73da790a WindowsMixedRealityHandTrackingLiveLink crash fix.
-Hand merging from Dev-vr
-Was crashing due to continued use of a structure which had been MoveTemp-ed to another.
-Now we copy that data before MoveTemp.
-Rearranged the function a bit to get everything into blocks of similar update frequency.
#review-7094325
#rb jason.bestimt patrick.boutot

[CL 7097463 by Jeff Fisher in Main branch]
2019-06-19 18:06:04 -04:00
patrick boutot
d62c2ec07a Remove deprecation warning for MixedReality LiveLink trancking
#jira UE-76419
#rb simon.therriault, jason.bestimt

#ROBOMERGE-SOURCE: CL 7089737 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7089744 by patrick boutot in Main branch]
2019-06-19 08:55:23 -04:00
Jeff Fisher
bf7e074430 LiveLink Windows Mixed Reality Hand Tracking initialization fix
-Was asserting during editor startup because we started using a uobject before it was initialized.
#rb none

[CL 6912847 by Jeff Fisher in Main branch]
2019-06-10 13:14:27 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00