Commit Graph

181 Commits

Author SHA1 Message Date
Andrew Rodham
2b44b580e4 Sequencer: Upgraded object binding IDs to be more portable when nested
- This change introduces two separate types for dealing with binding IDs in different spaces explicitly: FFixedObjectBindingID and FRelativeObjectBindingID. The latter is portable if the sequence it was created within is nested inside another foreign hierarchy.
  - FMovieSceneObjectBindingID remains, and is able to represent both of the new types, but should only be used for serialization to ensure compatability and consistency with editor tools that operate in different spaces.
  - Any manual ResolveLocalToRoot or GetSequenceID processing has now been replaced with the new ResolveBoundObjects API, which provides a less error-prone way of resolving bindings that live in different sequences

#jira UE-74450
#rb Max.Chen, Ludovic.Chabant

[CL 14915667 by Andrew Rodham in ue5-main branch]
2020-12-14 14:36:17 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Zousar Shaker
8cb2ea3473 Prototype Wrapped Object Pointers (ObjectHandle/ObjectPtr)
Call-site changes for non-scalar wrapped object pointer upgrade that overlap with automated pointer changes.

#rb devin.doucette

[CL 14822398 by Zousar Shaker in ue5-main branch]
2020-11-30 14:57:34 -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
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
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
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -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
Michal Valient
95d19f95b1 [REVERB] Merging //UE4/Private-Reverb-Development@13832732
#rb graham.wihlidal, rune.stubbe, brian.karis, andrew.lauritzen, jeff.farris

[CL 13834854 by Michal Valient in ue5-main branch]
2020-07-06 18:58:26 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
max chen
9d568c459b Sequencer: Playback controls
Deprecated PlayTo, ScrubTo, JumpTo for Frames, Seconds, and MarkedFrames. Replaced with SetPlaybackPosition() which takes PlaybackParams to specify the position (ie, frame, seconds, or marked frame) and an update method (play, scrub, jump).

Also, adding a new feature/function:

PlayTo() - play from the current time to a specified time

#rb andrew.rodham

#ROBOMERGE-SOURCE: CL 13137367 via CL 13137369 via CL 13137373
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v687-13115495)

[CL 13137377 by max chen in Main branch]
2020-05-01 00:11:16 -04:00
max chen
f538c6de2e Sequencer: Spawnables no longer defaults to spawning into the persistent level if the named level isn't found. Also, when a spawnable is added to sequencer, set the current level as the level to spawn into.
#rb ludovic.chabant

#ROBOMERGE-SOURCE: CL 12956553 via CL 12956566 via CL 12956613
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12956659 by max chen in Main branch]
2020-04-21 13:02:39 -04:00
Max Chen
1193fe7612 Sequencer: Clear transient flags on spawnable template components. This fixes a bug where adding components to an empty actor would not save those components.
#jira UE-90939
#rb andrew.rodham

[CL 12392942 by Max Chen in 4.25 branch]
2020-03-24 16:00:25 -04:00
Max Chen
26fd4f9913 Fix editor only
#rb none
#rnx
#jira UE-90793

[CL 12235938 by Max Chen in 4.25 branch]
2020-03-17 16:57:46 -04:00
Max Chen
7e8a59f5c8 Sequencer: Rename the director blueprint when the level sequence is renamed. This fixes a bug where if the level sequence is renamed, event tracks would stop working.
#jira UE-84852
#rb andrew.rodham

[CL 12234342 by Max Chen in 4.25 branch]
2020-03-17 14:34:02 -04:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
JeanMichel Dignard
99b55fb883 Merged main @ cl 10981486
#rb none
#rnx

[CL 10985598 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-14 14:45:07 -05:00
andrew rodham
a569c9da74 Updating copyright notices to the new standard
#rb None


#ROBOMERGE-SOURCE: CL 10940872 via CL 10940874
#ROBOMERGE-BOT: (v632-10940481)

[CL 10940879 by andrew rodham in Main branch]
2020-01-10 09:15:30 -05:00
andrew rodham
df63af5ef2 Sequencer: Added the ability to specify an external clock source interface to sequencer
This allows us to drive sequencer time from arbitrary external sources such as media players or other clocks.
Added a new media component which owns a media player and texture, such that media players can work nicely with multiplayer PIE
Added a new media track that can play back media sources on any UMediaPlayer* property - primitive for the time being (only looping is supported, no start time offset etc). This track is currently written to support real-time playback rather than offline, frame-accurate playback

#rb Max.Chen, Matt.Hoffman


#ROBOMERGE-SOURCE: CL 10940608 via CL 10940611
#ROBOMERGE-BOT: (v632-10940481)

[CL 10940614 by andrew rodham in Main branch]
2020-01-10 08:15:50 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -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
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00