Commit Graph

158 Commits

Author SHA1 Message Date
aurel cordonnier
25a11deeac Merge from Release-Engine-Staging @ 16579919
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-07 20:09:45 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Uriel Doyon
b9444f338f Added support for UVolumeTexture and UTexture2DArray streaming.
Texture 2D array streaming is implemented through FTexture2DArrayMipAllocator_Reallocate
Volume texture streaming is implemented through FVolumeTextureMipAllocator_Reallocate.
New generic stream out implementation in FTextureStreamOut.

Fixed different issues in FTexture2DMipDataProvider_IO relatively to optional bulks and IO errors.

Added UTexture::GetSurfaceDepth() for 3d textures.
Added UTexture::GetSurfaceArraySize() for array textures (where cubemaps return 6).

Moved UTexture2D::CancelPendingTextureStreaming() and UTexture2D::LevelIndex to UTexture.

Renamed UTexture2DArray::GetNumSlices() to UTexture2DArray::GetArraySize().

Fixed missing "virtual" keyword in base class UTextureMipDataProviderFactory.

Updated the texture editor UI so that it shows Texture2DArray array sizes and Texture3D depth.
Unified the UI for cubemaps so that it shows as an array with size 6.

Reimplemented "LODGroups" command to make it coherent with latest changes.

#rb jian.ru, danny.couture, matt.peters
#fyi mihnea.balta
#jira 	UE-97975, UE-81395, UE-102061, UE-84427

[CL 14832616 by Uriel Doyon in ue5-main branch]
2020-12-01 20:32:18 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -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
uriel doyon
d90de75955 Fixed possible division by 0 warnings.
#jira UE-92225
#rb rolando.caloca
#lockdown marcus.wassmer

#ROBOMERGE-SOURCE: CL 12936941 in //UE4/Release-4.25/... via CL 12936944 via CL 12936950
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12936954 by uriel doyon in Main branch]
2020-04-20 16:18:25 -04: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