Commit Graph

83 Commits

Author SHA1 Message Date
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
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
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
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
max chen
997b0b4184 Sequencer: Add options to normalize or specify a floating point range for the curve display
#jira UE-117991
#p4v-cherrypick 16886999

#ROBOMERGE-SOURCE: CL 16888002 via CL 16913702
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16913871 by max chen in ue5-release-engine-test branch]
2021-07-21 15:24:02 -04:00
aurel cordonnier
25a11deeac Merge from Release-Engine-Staging @ 16579919
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-07 20:09:45 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
bob tellez
2239184d79 Back out changelist 16363140, restoring 16358435 with a fix for serialization differences
[FYI] Max.Chen


#ROBOMERGE-SOURCE: CL 16363392 via CL 16363401 via CL 16363408
#ROBOMERGE-BOT: (v804-16311228)

[CL 16363673 by bob tellez in ue5-release-engine-staging branch]
2021-05-17 22:58:19 -04:00
bob tellez
272a123c93 Back out changelist 16358435. Native serialization crash at startup
[FYI] Max.Chen


#ROBOMERGE-SOURCE: CL 16363140 via CL 16363147 via CL 16363150
#ROBOMERGE-BOT: (v804-16311228)

[CL 16363671 by bob tellez in ue5-release-engine-staging branch]
2021-05-17 22:58:05 -04:00
max chen
695bcffcfb Sequencer: Embedded curve view for float channels
Added menu options for float channels to "Show Curve" and set "Key Area Height". FMovieSceneFloatChannel now has a toggleable bShowCurve and the key area height is determined  by a sequencer setting, KeyAreaHeightWithCurves.

The FFortniteMainBranchObjectVersion has been bumped for the custom serialization of FMovieSceneFloatChannel with the new bShowCurve property.

#jira UE-104730
#rb andrew.rodham


#ROBOMERGE-SOURCE: CL 16358435 via CL 16358520 via CL 16358557
#ROBOMERGE-BOT: (v804-16311228)

[CL 16359388 by max chen in ue5-release-engine-staging branch]
2021-05-17 17:23:37 -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
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
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
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
d122f33066 Sequencer: Remove label browser settings
#rb none
#rnx
#jira UE-88724

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

[CL 11451091 by max chen in 4.25-Plus branch]
2020-02-14 17:29:22 -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
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
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
Max Chen
61603c83e4 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL#8390086
#rb none

[CL 8393238 by Max Chen in Dev-Editor branch]
2019-09-01 02:03:35 -04:00
Max Chen
d391c9dd0f Sequencer: Add MovieSceneChannel::DeleteKeysFrom
Changed trim left/right and split to remove keys outside of the trim and split ranges.

MovieSceneFloatChannel implements DeleteKeysFrom by inserting a key at the split point so that the shape of the curve is retained.

#jira UESEQ-525
#rb mike.zyracki

[CL 8388273 by Max Chen in Dev-Editor branch]
2019-08-30 23:27:49 -04:00
max chen
892eda0b89 Sequencer: Set value snap to 0.1f
#jira UE-79230
#rb matt.hoffman
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8200278 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8200327 by max chen in Main branch]
2019-08-21 18:16:48 -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
Nicolas Nebel
a9f3f32176 Curve Editor: Add snap to grid option and allow users to set grid spacing
#jira UE-74422
#jira UE-75019
#rb max.chen andrew.rodham

[CL 7465722 by Nicolas Nebel in Dev-Editor branch]
2019-07-19 19:40:14 -04:00