Commit Graph

71 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
Marc Audy
c43360f47c Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#[fyi] Aurel.Cordonnier

#ushell-cherrypick of 18448630 by Marc.Audy
#preflight none

[CL 18483677 by Marc Audy in ue5-main branch]
2021-12-17 03:41:59 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -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
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
795d4c2437 Sequencer: Make calls to OnSectionMoved consistent in dragging operations.
Call OnSectionMoved on both sections being moved and resized, both during interactive dragging and at the end of the operation (before this change it was called in one or other situation but not both consistently).
To differentiate between the two situations (in case it's important), we add a new parameter struct that provides more information.

#rb ludovic.chabant
#jira none

#ROBOMERGE-SOURCE: CL 11502484 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11502525 by max chen in 4.25-Plus branch]
2020-02-18 12:27:40 -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
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
max chen
073bc786ac Sequencer: Clamp mouse position to prevent sections from jumpng to the bottom when dragging up
#jira UE-81736
#rb max.chen

#ROBOMERGE-SOURCE: CL 10129528 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10129546 by max chen in Main branch]
2019-11-13 13:15:21 -05:00
max chen
98f584307e Sequencer: Increase stability of track/section sorting and placement, especially when user is dragging sections between rows
#jira UE-47098 UE-81333
#rb max.chen
#rnx

#ROBOMERGE-SOURCE: CL 10129106 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10129133 by max chen in Main branch]
2019-11-13 13:07:35 -05:00
Jeffrey Soldan
9e753b8373 Sequencer: Clamp mouse position to prevent sections from jumpng to the bottom when dragging up
#jira UE-81736
#rb max.chen

[CL 9877540 by Jeffrey Soldan in Dev-Editor branch]
2019-10-28 22:34:16 -04:00
ludovic chabant
eb49acb01d Sequencer: Call BeginSlipSection correctly.
#rb max.chen, matt.hoffman

[CL 9765332 by ludovic chabant in Dev-Editor branch]
2019-10-23 18:15:57 -04:00
Jeffrey Soldan
1702ee56a9 Sequencer: Increase stability of track/section sorting and placement, especially when user is dragging sections between rows
#jira UE-47098 UE-81333
#rb max.chen

[CL 9549700 by Jeffrey Soldan in Dev-Editor branch]
2019-10-11 13:08:56 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
2019-10-01 20:41:42 -04:00
Jeffrey Soldan
597fb19b50 Sequencer: Add support for grouping/linking sections so dragging maintains the relative offset
#jira UESEQ-368
#rb @max.chen

[CL 8923601 by Jeffrey Soldan in Dev-Editor branch]
2019-09-19 22:23:08 -04:00
Jeffrey Soldan
304c2e69a9 Sequencer: Fix sections not being visible when dragging a section creates additional subtracks.
#jira UE-79878
#rb @max.chen

[CL 8920976 by Jeffrey Soldan in Dev-Editor branch]
2019-09-19 19:43:27 -04: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
Chris Gagnon
d7d4ee7b38 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
#rb none
#fyi Max.Chen, Tim.Gautier

[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
max chen
68414fef23 Sequencer: Decouple keep cursor in playback range while scrubbing with key/section snapping to playback range
#rb none
#jira UESEQ-479

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

[CL 7472369 by max chen in Main branch]
2019-07-20 23:45:09 -04:00
max chen
cb72a00fa6 Sequencer: Null section check
#rb none
#jira none

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

[CL 7309476 by max chen in Main branch]
2019-07-15 12:05:31 -04:00