Commit Graph

81 Commits

Author SHA1 Message Date
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
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
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
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
Max Chen
74822c6a2d Sequencer: ALevelSequenceActor now implements RewindForReplay which will stop the sequence when seeking starts in a replay. This solves issues where seeking before the sequence started would not restore the state as no new network packets are sent to update the state. Reset NetSyncProps of the sequence player when RewindForReplay() is called to prevent the sequence from playing at the wrong time
#jira FORT-186246
#rb matt.hoffman, ryan.gerleve, andrew.rodham

[CL 10018006 by Max Chen in Dev-Editor branch]
2019-11-05 13:33:48 -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
ludovic chabant
78fe4eefe2 Add level sequence setting for handling the aspect ratio constraint during play.
The new setting defaults to overriding the constraint to XFOV to preserve previous behaviour. It lets the user choose what kind of constraint to use during the sequence, or whether to not touch the constraint at all.

#jira UE-76517
#rb max.chen, matthoffman, andrew.rodham

[CL 7824809 by ludovic chabant in Dev-Editor branch]
2019-08-06 17:06:27 -04:00
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -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
Chris Gagnon
0a9f86357f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
Max Chen
129951b165 Sequencer: Follow up CIS fix for 6088894
#rb none

[CL 6094006 by Max Chen in Dev-Sequencer branch]
2019-04-25 11:03:45 -04:00
Max Chen
8ce0576eac Sequencer: Default the snapshot's active shot to the current sequence in case there are no shots being rendered. This fixes an issue where {Slate} and {TakeNumber} don't work.
#jira FURY-107
#rb none

[CL 6088894 by Max Chen in Dev-Sequencer branch]
2019-04-24 18:52:29 -04:00
Max Chen
da79df1d46 Sequencer: Tick sequencer separately.
This is needed so that sequencer actors can tick first, putting objects in their desired locations and then allowing other systems to respond. This fixes special cases where sequencer would tick animation again if it had ticked before sequencer.

#jira UE-59735
#jira UE-61706
#jira UE-69731
#jira UE-72639
#rb marc.audy, andrew.rodham

[CL 5901999 by Max Chen in Dev-Sequencer branch]
2019-04-15 14:03:33 -04:00
Max Chen
c33049fcbd Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 5730143 by Max Chen in Dev-Sequencer branch]
2019-04-04 02:48:32 -04:00
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Max Chen
48e79c6799 Sequencer: Add function to get the active camera cut camera. Allow camera cut evaluation, but disable binding to the player when CanUpdateCameraCut is false.
#jira UE-68999
#rb matt.hoffman

[CL 4806585 by Max Chen in Dev-Sequencer branch]
2019-01-24 19:26:25 -05:00
Chris Gagnon
0dbe1f7fb2 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -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
andrew rodham
6f1c48e7f2 Sequencer: Bindings that exist within instance sub levels now work correctly
- On playback we now cache off both the original asset path name, and the level ptr if we're playing back within a level that has a ULevelStreaming associated with it
  - When resolving bindings, we compare the original binding's asset path name to the one we're playing back within. If it matches, we resolve using the ULevel ptr provided, rather than the UWorld.
  - Ultimately we would like to change this all to make the context _always_ a ULevel rather than a UWorld, but that is a high risk change to make since a lot of code (mostly editor code) heavily relies on the playback context being a UWorld.

#rb Max.Chen


#ROBOMERGE-SOURCE: CL 4729768 via CL 4729775

[CL 4729792 by andrew rodham in Main branch]
2019-01-15 17:59:36 -05:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00