Commit Graph

354 Commits

Author SHA1 Message Date
ben marsh
a6cc4468b7 More IncludeTool fixes.
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 8371085 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v406-8472469)

[CL 8497721 by ben marsh in Main branch]
2019-09-04 15:28:59 -04:00
benoit deschenes
2f775ed1e0 Integrating CL #7794913 from Dev-Enterprise
Fixing Virtual Texture conversion tool

#jira UE-78434
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: benoit.deschenes
#ROBOMERGE-SOURCE: CL 7795940 in //UE4/Release-4.23/... via CL 7795966
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7867085 by benoit deschenes in Dev-Build branch]
2019-08-08 05:29:09 -04:00
benoit deschenes
d1a8e8e3ae Integrating CL 7700278
Fixing opacity mask using Virtual Textures at Datasmith import

#jira UE-78125
#rb Alexis.Matte

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: benoit.deschenes
#ROBOMERGE-SOURCE: CL 7703036 in //UE4/Release-4.23/... via CL 7703044
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7810739 by benoit deschenes in Dev-Build branch]
2019-08-06 13:19:00 -04:00
richard talbotwatkin
6848d13be8 Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: richard.talbotwatkin
#ROBOMERGE-SOURCE: CL 7668562 in //UE4/Release-4.23/... via CL 7668565
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7797834 by richard talbotwatkin in Dev-Build branch]
2019-08-06 11:47:19 -04:00
benoit deschenes
590bfcb3f7 Integrating CL #7794913 from Dev-Enterprise
Fixing Virtual Texture conversion tool

#jira UE-78434
#rb none

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

[CL 7795966 by benoit deschenes in Main branch]
2019-08-06 11:36:20 -04:00
benoit deschenes
22f347d191 Integrating CL 7700278
Fixing opacity mask using Virtual Textures at Datasmith import

#jira UE-78125
#rb Alexis.Matte

#ROBOMERGE-SOURCE: CL 7703036 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7703044 by benoit deschenes in Main branch]
2019-08-01 18:07:08 -04:00
richard talbotwatkin
c0ef3053d2 Deprecated direct access to UStaticMesh::SourceModels, SectionInfoMap and OriginalSectionInfoMap.
Added new accessors for getting individual SourceModels, or the entire array.
#rb none
#jira none

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

[CL 7668565 by richard talbotwatkin in Main branch]
2019-07-31 03:40:45 -04:00
martin wilson
f469ddefa9 Disable creating streamable animations in 4.23. Feature will be reworked for 4.24
#jira none
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 7291391 in //UE4/Release-4.23/... via CL 7291395
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7356658 by martin wilson in Dev-Build branch]
2019-07-17 01:50:21 -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
martin wilson
8be63c9e22 Disable creating streamable animations in 4.23. Feature will be reworked for 4.24
#jira none
#rb none

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

[CL 7291395 by martin wilson in Main branch]
2019-07-12 14:17:24 -04:00
jamie dale
f2058a5b7c Fixed localization gather warnings
#jira
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 7072335 in //UE4/Release-4.23/... via CL 7072359
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7125708 by jamie dale in Dev-Build branch]
2019-06-21 02:17:24 -04:00
ben marsh
11f022162f Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 6944849 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7089689 by ben marsh in Dev-Build branch]
2019-06-19 08:52:32 -04:00
jamie dale
dd6213fb22 Fixed localization gather warnings
#jira
#rb none
#rnx

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

[CL 7072359 by jamie dale in Main branch]
2019-06-18 16:41:05 -04:00
martin wilson
c5b986f79b Streamable animation asset and streaming animation support
#rb Benn.Gallagher

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 6925970 via CL 6926067 via CL 6926110
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6951065 by martin wilson in Dev-Build branch]
2019-06-12 02:57:17 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
martin wilson
d211aef0a1 Streamable animation asset and streaming animation support
#rb Benn.Gallagher


#ROBOMERGE-SOURCE: CL 6925970 via CL 6926067
#ROBOMERGE-BOT: (v366-6836689)

[CL 6926110 by martin wilson in Main branch]
2019-06-11 07:01:48 -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
max chen
2b61878c3e Copying //UE4/Dev-Sequencer to Dev-Main (//UE4/Dev-Main) [at] 6863847
#lockdown nick.penwarden
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 6863971 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6917141 by max chen in Dev-Build branch]
2019-06-10 16:16:26 -04:00
lina halper
bab821de19 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 6861656
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 6863572 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6917136 by lina halper in Dev-Build branch]
2019-06-10 16:16:11 -04:00
Michael Lentine
f9b3324b32 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
#rb none
#rnx

[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -04:00
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
marc audy
3fc04f1c88 Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 6835245
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 6835252 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6873661 by marc audy in Dev-Build branch]
2019-06-07 05:00:15 -04:00
Max Chen
58ed55be26 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none
#lockdown nick.penwarden

[CL 6863746 by Max Chen in Dev-Sequencer branch]
2019-06-06 13:46:20 -04:00
Max Chen
b4a5482916 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 6849452 by Max Chen in Dev-Sequencer branch]
2019-06-05 11:49:03 -04:00
stefan boberg
285a908f86 Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v365-6733468)

[CL 6821265 by stefan boberg in Dev-Build branch]
2019-06-03 19:09:16 -04:00