Commit Graph

18 Commits

Author SHA1 Message Date
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -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
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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
max chen
31a8758d1c Sequencer: Fix start/end offset upgrade paths for audio, skeletal, geometry cache sections. Upgrade should be done based on the display resolution, not the legacy resolution.
#jira UE-77400
#rb none

#ROBOMERGE-SOURCE: CL 7439336 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7439338 by max chen in Main branch]
2019-07-18 13:17:39 -04:00
arciel rekman
1e8c6557f1 Fix non-editor builds.
[FYI] Mike.Zyracki
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 5356543 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5367796 by arciel rekman in Main branch]
2019-03-12 06:52:48 -04:00
mike zyracki
94c875791e Fix for geometry caches evaluating in packaged builds and use UGeometryCache as an asset, adding needed functions to it.
(Will talk to Jurre about maybe putting Duration itself on the UGeometryCache itself, as it is there is some duplication since I don't want the Component to call the slightly inefficient UGeometryCache implementation that manually calc's the duration isntead of caching it).

Note that I changed GeometryCache to a weak pointer instead of a soft object path recently to try to fix the spawnable issue.  So the conversion is for older files is valid.

#jira UE-71032
#jira UE-70298
#rb max.chen

#ROBOMERGE-SOURCE: CL 5352736 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5364914 by mike zyracki in Main branch]
2019-03-11 18:57:59 -04:00
mike zyracki
853fcbcc04 Fix for Geometry Cache Tracks not loading with Spanwables.
#rb matt.hoffman
#jira UE-70598

#ROBOMERGE-SOURCE: CL 5205589 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5225215 by mike zyracki in Main branch]
2019-02-27 10:40:38 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Jurre deBaare
17883d8e90 Adding PostLoad routing to super class
[CL 4751808 by Jurre deBaare in Dev-Anim branch]
2019-01-18 11:42:30 -05:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
max chen
d1ed408be5 Sequencer: Change geometry cache component to soft object path to fix GLEOs
#jira UE-60002
#rb none
[CODEREVIEW] mike.zyracki

#ROBOMERGE-SOURCE: CL 4127415 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)

[CL 4127418 by max chen in Staging-4.20 branch]
2018-06-13 11:37:42 -04:00
mike zyracki
4b6edeac12 #ROBOMERGE-AUTHOR: mike.zyracki
Geometry Cache Sequencer Support for 4.20
#jira UESEQ-372
#rb max.chen

#ROBOMERGE-SOURCE: CL 4098542 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)

[CL 4098543 by mike zyracki in Staging-4.20 branch]
2018-05-29 18:32:14 -04:00