Commit Graph

54 Commits

Author SHA1 Message Date
Max Chen
e0999a36d1 Sequencer: Fix view range when getting the mouse position with the context menu
#jira UE-154164
#rb matt.hoffman
#preflight 628f1df69a2b52f7c70efbbd

[CL 20379938 by Max Chen in ue5-main branch]
2022-05-26 11:39:33 -04:00
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
c533a715c0 Sequencer: Only clamp to view range when scrubbing. Otherwise setting the time from shortcuts which call into the time slider controller get clamped to the view range.
#jira UE-153961
#preflight 628d3548af76b78af54d4550
#rb matt.hoffman

[CL 20354351 by Max Chen in ue5-main branch]
2022-05-24 15:55:05 -04:00
Lauren Barnes
6248f8d412 Replacing legacy EditorStyle calls with AppStyle
#preflight 6272a74d2f6d177be3c6fdda
#rb Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 20057269 via CL 20070159 via CL 20072035 via CL 20072203
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)
#ROBOMERGE-CONFLICT from-shelf

[CL 20105363 by Lauren Barnes in ue5-main branch]
2022-05-09 13:12:28 -04:00
max chen
4fa0309007 Sequencer: Clamp to playback range before snapping to frames, otherwise the scrubbed to frame could be a subframe when snapping is on.
#jira UE-146757
#preflight 623a0ec904769ab49357f0a9
#rb matt.hoffman

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 19471303 via CL 19488245 via CL 19488378
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19489504 by max chen in ue5-main branch]
2022-03-23 20:03:04 -04:00
max chen
60443fa675 Sequencer: Fix missing use of DilationPixels which is used to expand the hit region when testing for the scrubber. This fixes an issue where sometimes the hit test would fall through to dragging the playback ranges instead of dragging the time scrubber. Also, don't display the left/right cursor if the drag type is none
#preflight 620ffb02cc18880e8bba32c7
#mike.zyracki

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 19058696 via CL 19065459 via CL 19065541 via CL 19065773
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v918-19018356)

[CL 19066959 by max chen in ue5-main branch]
2022-02-21 02:55:04 -05:00
HertzDonut
ca03ff9bca PR #8888: Fixing Sequencer scrub bar to more fully respect the "ReadOnly" status of Sequencer (Contributed by HertzDonut)
Lock button shows blue/on when locked
Disable adding/moving marks when locked
Disable playback range and mark menu options when locked
Selection is still allowed

#jira UE-142083
#preflight 6205ac310c64e1822f4b69a7
#rb max.chen

#ROBOMERGE-OWNER: max.chen
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 18954849 via CL 18954889 via CL 18954905 via CL 18955927 via CL 18956265
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18958367 by HertzDonut in ue5-main branch]
2022-02-11 14:43:42 -05:00
mike zyracki
d2b37cbca2 Sequencer: Add ability for middle mouse to change time without evaluating sequencer.
#jira UE-137560
#rb max.chen
#preflight 61b9198a032c36821eb0c88c

#ROBOMERGE-AUTHOR: mike.zyracki
#ROBOMERGE-SOURCE: CL 18480324 in //UE5/Release-5.0/... via CL 18481561
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18481829 by mike zyracki in ue5-release-engine-test branch]
2021-12-16 19:58:00 -05:00
max chen
a4c93e8e4d Sequencer: Add option to snap play time to section bounds. Follow up to CL 17818309
#jira UE-136756
#preflight 61b011c61649962b666cfaf3
#rb matt.hoffman

#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 18406911 in //UE5/Release-5.0/... via CL 18406997
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18407006 by max chen in ue5-release-engine-test branch]
2021-12-08 11:38:25 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
2021-05-11 01:10:20 -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
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -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
max chen
ccd42b45c5 Sequencer: Add support for toggling markers in a subsequence to be globally visible in other subsequences
#jira UE-86546
#rb max.chen

#ROBOMERGE-SOURCE: CL 12465476 via CL 12467404 via CL 12467572
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12467607 by max chen in Main branch]
2020-03-27 10:57:43 -04:00
Patrick Boutot
b67ff68e04 Copying //UE4/Dev-VirtualProduction to //UE4/Dev-Tools-Staging @ 11168401
#rb none
#rnx

[CL 11170710 by Patrick Boutot in Dev-Tools-Staging branch]
2020-01-29 18:45:15 -05:00
Patrick Boutot
7e35283da1 Merged main [at] cl 10981486
//Dev-VirtualProduction/Engine...

#rb none
#rnx
#AUTHOR: jeanmichel.dignard
#SOURCE: CL 10985598 in //UE4/Dev-Tools-Staging/...

[CL 11066063 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-20 13:49:11 -05:00
Patrick Boutot
410c720ac7 Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx
#author jeanmichel.dignard

[CL 10992634 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-15 09:39:21 -05:00
max chen
225208f187 Sequencer: Fix removing marked frames so that it's based on the hit index, rather than finding it by the FFrameNumber. renamed "Clear Marked Frame" to "Delete Marked Frame"
#jira UE-86542
#rb none


#ROBOMERGE-SOURCE: CL 10948186 via CL 10948273
#ROBOMERGE-BOT: (v632-10940481)

[CL 10948290 by max chen in Main branch]
2020-01-11 00:08:42 -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
43d5ec534f Sequencer: Playback and selection range exlusive drawing fix. Change to access the bound value directly since Discrete gives +1.
#jira UE-82842
#rb andrew.rodham
#rnx

#ROBOMERGE-SOURCE: CL 10088831 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10088840 by max chen in Main branch]
2019-11-08 17:16:01 -05:00
max chen
59120e2aa0 Sequencer: Playback and selection range exlusive drawing fix. Change to access the bound value directly since Discrete gives +1.
#jira UE-82842
#rb andrew.rodham

#ROBOMERGE-SOURCE: CL 9969152 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v560-9963197)

[CL 9969155 by max chen in Main branch]
2019-11-04 11:57:53 -05:00
max chen
ade3d25b68 Sequencer: Ensure bMouseDownInRegion is cleared on mouse up
#jira FURY-126
#rb none

#ROBOMERGE-SOURCE: CL 7065500 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7065502 by max chen in Main branch]
2019-06-18 14:13:47 -04:00
Max Chen
697a6f07ef Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 6643490 by Max Chen in Dev-Sequencer branch]
2019-05-25 03:15:46 -04:00
Max Chen
1de1b79534 Sequencer: Dragging marks
Fixed missing transaction/modify for add/remove marked frame.
Right click menu for hovered marked frame now uses HitTestMark instead of testing the single frame that the mouse is over.

#jira UESEQ-475
#rb none

[CL 5741606 by Max Chen in Dev-Sequencer branch]
2019-04-04 12:27:34 -04:00