Commit Graph

114 Commits

Author SHA1 Message Date
Max Chen
0167d4ea0f Sequencer: MVVM2 branch and Layer Bars
Copying //Tasks/UE5/Dev-SequencerMVVM2 to Main (//UE5/Main) @20364093

#preflight 628866dfb94f739b152c1e29
#preflight 628866e4585e8f793ee80943
#rb ludovic.chabant, andrew.rodham
#fyi ludovic.chabant, andrew.rodham, andrew.porter
#jira UE-105322

[CL 20364493 by Max Chen in ue5-main branch]
2022-05-25 10:39:33 -04:00
max chen
0336fbae9d Sequencer/Valkyrie: Ensure when a valid track editor isn't found for a particular track. This can happen if you create a track that is no longer supported.
#rb andrew.rodham, matt.hoffman
#preflight 6270563191629533ec2b6f79

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 20031428 via CL 20033157 via CL 20033352 via CL 20033424
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20035196 by max chen in ue5-main branch]
2022-05-03 19:51:01 -04:00
Mike Zyracki
377715fa01 Sequencer: Space Switching UX For curve Editor
#robomerge 5.0
#preflight 615b3adffe00590001e0e29d
#rb max.chen

[CL 17711731 by Mike Zyracki in ue5-main branch]
2021-10-04 14:53:01 -04:00
Max Chen
3ff899841d Sequencer: Don't allow drawing the drop target on the spacer node's track lane
#jira UE-121317

[CL 17142562 by Max Chen in ue5-main branch]
2021-08-11 17:15:01 -04:00
max chen
c9b317c799 Sequencer: Fix mute row not restoring properly by ensuring only rewriting the mute and solo paths if they actually exist. Also, reparent to the root instead of null
#jira UE-116053
#rb ludovic.chabant

#ROBOMERGE-SOURCE: CL 16388382 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v804-16311228)

[CL 16397874 by max chen in ue5-main branch]
2021-05-20 00:58:43 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -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
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Max Chen
28661fdad6 Sequencer: Add spacer node after filtering
#jira UE-104400
#rb andrew.rodham

[CL 14902014 by Max Chen in ue5-main branch]
2020-12-10 17:35:21 -04:00
Max Chen
dd2a79c760 Sequencer: Add a spacer node at the bottom of the tree and ensure that it's not selectable and doesn't highlight on hover. This allows for scrolling past the last node so that the last node is visible above the info text.
#jira UE-102714
#rb matt.hoffman, andrew.rodham

[CL 14875504 by Max Chen in ue5-main branch]
2020-12-07 20:16:07 -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
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
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
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
41d284a263 Sequencer: Implemented NodeGroups
#rb max.chen

#ROBOMERGE-SOURCE: CL 12465515 via CL 12467430 via CL 12467606
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12467695 by max chen in Main branch]
2020-03-27 10:58:38 -04:00
max chen
23149e04e3 Sequencer: Added missing transactions for mute and solo
#rb none
#rnx
#jira none

#ROBOMERGE-SOURCE: CL 11938195 in //UE4/Release-4.25/... via CL 11938196
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11938235 by max chen in Main branch]
2020-03-05 11:40:05 -05:00
Chris Gagnon
76c6bcbfeb UE4 Main merged to Dev-Tools-Staging at CL 11164391
#rb none

[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -05: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
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -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
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00