Commit Graph

147 Commits

Author SHA1 Message Date
steve smith
cb8d5d264e Merge 11440643 from Dev-VR: Implement "OnGetSupportedVideoFormats" for ARCore
#jira UE-86023
#rb steve.smith
#rnx
#robomerge ignore

[CL 11446800 by steve smith in 4.25 branch]
2020-02-14 14:32:56 -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
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
steve smith
72482bfda1 Merged from partner branch:
Fixed the FaceAR sample

- Marked UARFaceGeometry::bIsTracked as deprecated in blueprint and changed FaceARPawn to use the correct API instead
- Set LivelinkTrackingType to FaceTracking to enable live link for Face AR

#rb ryan.vance
#jira none

#ROBOMERGE-SOURCE: CL 9896938 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v558-9892490)

[CL 9896940 by steve smith in Main branch]
2019-10-30 18:13:27 -04:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -04:00
ben marsh
9e00890197 Integrating bug fixes from the arkit stream
#rb integration
#jira 0
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9386082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9386095 by ben marsh in Main branch]
2019-10-02 17:32:29 -04:00
joe conley
f2409e2ffa Merging //UE4/Main[at]9314622 to Dev-RenderPlat-Staging
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 9315153 in //UE4/Dev-RenderPlat-Staging/...
#ROBOMERGE-BOT: DEVVR (Dev-RenderPlat-Staging -> Dev-VR) (v455-9298202)

[CL 9318813 by joe conley in Dev-VR branch]
2019-10-01 14:25:49 -04:00
jon nabozny
6b60663f39 Update Engine and Plugins to use the new Getters / Setters for UActorComponent, USceneComponent, and AActor replicated properties
[at]Ryan.Gerleve, [at]Brian.Bekich
#rb None


#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 9290108 via CL 9290249
#ROBOMERGE-BOT: (v452-9288972)

[CL 9290520 by jon nabozny in Main branch]
2019-09-29 16:49:10 -04:00
Jason Bestimt
a530f72f7d Updating from //UE4/Dev-RenderPlat-Staging to Dev-VR (//UE4/Dev-VR) to turn on robomerge
#RB:none

[CL 9106247 by Jason Bestimt in Dev-VR branch]
2019-09-25 16:05:50 -04:00
Andrew Grant
c808e66c40 Merging ARKit changes from dev branch
#jira na
#rb Swarm

[CL 8962600 by Andrew Grant in Main branch]
2019-09-22 08:00:56 -04:00
jeff fisher
0ca16e5e9a UE-79885 HL2 CL integrations
-Fixing missing include.
#rb build
#lockdown nick.penwarden
#jira UE-79885

#ROBOMERGE-SOURCE: CL 8926470 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v429-8924992)

[CL 8926471 by jeff fisher in Main branch]
2019-09-20 09:55:27 -04:00
jeff fisher
5a3eff13b4 UE-79885 HL2 CL integrations
Merging //UE4/Partner-Microsoft-XR to Release-4.23 (//UE4/Release-4.23) Change: 8633331
-Initial support for HoloLens remote spatial mapping
-Also merged in MRMesh setmaterial fix.
#rb Ryan.Vance
#lockdown nick.penwarden
#jira UE-79885

#ROBOMERGE-SOURCE: CL 8916376 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v427-8887818)

[CL 8916403 by jeff fisher in Main branch]
2019-09-19 18:36:43 -04:00
ben marsh
89ff5eb6af Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 8195018 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v401-8057353)

[CL 8276498 by ben marsh in Dev-VR branch]
2019-08-24 14:29:14 -04:00
andrew grant
9555b3ce47 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/... via CL 8063864
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v400-8057353)

[CL 8074516 by andrew grant in Dev-VR branch]
2019-08-16 01:58:17 -04:00
andrew grant
c494321bb0 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/... via CL 8063864
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v400-8057353)

[CL 8072884 by andrew grant in Dev-Build branch]
2019-08-16 00:54:22 -04:00
andrew grant
4a0e605510 Header changes required for ARKit 3 support.
#jira na
#rb ryan.vance
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8063861 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8063864 by andrew grant in Main branch]
2019-08-15 14:34:11 -04:00
joe conley
bde259bf5d #jira UE-77069 - UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness ignored for BoundaryPolygons
UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness were ignored for BoundaryPolygons, pass them through.

#rb Jules.Blok

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 7266014 in //UE4/Release-4.23/... via CL 7266020
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v371-7306989)

[CL 7367917 by joe conley in Dev-VR branch]
2019-07-17 03:19:58 -04:00
joe conley
53b6e686c2 #jira UE-77069 - UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness ignored for BoundaryPolygons
UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness were ignored for BoundaryPolygons, pass them through.

#rb Jules.Blok

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 7266014 in //UE4/Release-4.23/... via CL 7266020
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7337852 by joe conley in Dev-Build branch]
2019-07-16 23:44:14 -04:00
zzz77
97e4a99783 PR #6033: Fixes for IntelliSense (Contributed by zzz77)
#rb none
#rnx

[CL 7308593 by Ben Marsh in Dev-Build branch]
2019-07-15 10:09:44 -04:00
joe conley
d46d4bdf01 #jira UE-77069 - UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness ignored for BoundaryPolygons
UARPlaneGeometry::DebugDraw() - PersistForSeconds and OutlineThickness were ignored for BoundaryPolygons, pass them through.

#rb Jules.Blok

#ROBOMERGE-SOURCE: CL 7266014 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7266020 by joe conley in Main branch]
2019-07-10 15:44:15 -04:00
Joe Graf
b4d851d903 Added UARTrackedQRCode to unblock Vicuna
Updated the HoloLens AR plugin to use the data from the interop to populate UARTrackedQRCode objects
Fixed some coding standard conflicts in the QRCode callbacks

MixedRealityInterop
- Updated the QR code to use the shared conversion routines
- Removed some redundant initialization

#rb: none
#fyi: chris.norden, david.hibbitts

[CL 7010557 by Joe Graf in Dev-VR branch]
2019-06-14 16:15:44 -04:00
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -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
Ryan Vance
66b718c72f Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
#lockdown Nick.Whiting

[CL 6841995 by Ryan Vance in Dev-VR branch]
2019-06-04 18:54:52 -04:00