Commit Graph

74 Commits

Author SHA1 Message Date
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40: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
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
Andrew Rodham
674a5d1cba Curve Editor: Tree filtering and synchronization improvements
This is a direct copy from CL 7095088 with a partial revert of original CL 6759985 to address the merge conflict

  - When changing selection in sequencer, the curve editor now selects the same nodes on its tree as well as isolating (auto-filtering) the tree to those nodes. This makes it much easier to drill down into curves from the sequence. Both these settings are configurable through the Editor Preferences ("Synchronize Curve Editor Selection" and "Isolate Curve Editor To Selection")
  - Changed pin widgets to only be visible when their table row is hovered, or if the pin is active
  - Changed filter logic to exclude implicit children when a sibling was explicitly matched. This prevents seemingly unmatched nodes showing up in hierarchies where nested matches occur.
  - Expanded text filter logic to include Parent.Child.Gradchild syntaxfor matching specific hierarchies of nodes

#jira UE-76189
#rb Max.Chen, Matt.Hoffman

#ROBOMERGE-OWNER: Andrew.Rodham
#ROBOMERGE-AUTHOR: andrew.rodham
#ROBOMERGE-SOURCE: CL 7099711 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7099743 by Andrew Rodham in Main branch]
2019-06-20 08:13:28 -04:00
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -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
d664aad3ec Sequencer: Add setting to determine whether to show the outliner info column
#rb none
#jira UE-70625

[CL 5223980 by Max Chen in Dev-Sequencer branch]
2019-02-27 01:10:45 -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
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
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00