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
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
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
bc88b73a29
Merge Release-Engine-Staging to Main @ CL# 15151250
...
Represents UE4/Main @ 15133763
[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -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
brooke hubert
48113fc77e
Adding EditorFramework to build.cs files
...
#rnx
#Jira UE-96448
#rb chris.gagnon
[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -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
mike zyracki
cdd2cd35e5
CurveEditor: Scaling with Transform Tool would revert on mouse up.
...
#jira UE-90460
#rb matt.hoffman
[FYI] lauren.barnes
#ROBOMERGE-SOURCE: CL 12152934 in //UE4/Release-4.25/... via CL 12152947
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)
[CL 12152974 by mike zyracki in Main branch]
2020-03-12 15:30:05 -04:00
max chen
c9fdc84752
Curve Editor: Change mode hotkeys to have a modifier. Transform - Ctrl-T, Retime - Ctrl-E, Multi - Ctrl-M. This removes conflicts with w,e,r which are reserved for the viewport transform gizmo. Ctrl-W is used for weighted tangents.
...
#jira UE-90207
#rb mike.zyracki
#ROBOMERGE-SOURCE: CL 12133282 in //UE4/Release-4.25/... via CL 12133295
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)
[CL 12140399 by max chen in Main branch]
2020-03-11 17:10:36 -04:00
mike zyracki
e69735b1f7
Curve Editor: FFT would crash due to too small baking interval.
...
#jira UE-87208
#rb matt.hoffman
#ROBOMERGE-SOURCE: CL 11615751 in //UE4/Release-4.25/... via CL 11615754
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)
[CL 11615769 by mike zyracki in Main branch]
2020-02-25 15:11:01 -05:00
Thomas Sarkanen
de2be528ca
Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown nick.penwarden
[CL 11214797 by Thomas Sarkanen in Main branch]
2020-02-04 11:06:23 -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
lauren barnes
c5aa0bcfce
Curve editing tools now specify interactive vs. non-interactive changes
...
#jira UE-85567
#rb Matt.Hoffman
#rnx
#ROBOMERGE-SOURCE: CL 11074040 via CL 11074041
#ROBOMERGE-BOT: (v637-11041722)
[CL 11074042 by lauren barnes in Main branch]
2020-01-21 13:01:11 -05:00
Ryan Durand
28d3d740dd
(Integrating from Dev-EngineMerge to Main)
...
Second batch of remaining Engine copyright updates.
#rnx
#rb none
#jira none
[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
max chen
344018713b
Curve Editor: Prevent throttling on drag so that editing keys updates the viewport immediately.
...
#jira UE-82020
#rb matt.hoffman, mike.zyracki
#ROBOMERGE-SOURCE: CL 9691850 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v538-9681622)
[CL 9691852 by max chen in Main branch]
2019-10-18 12:43:54 -04:00
Jamie Dale
72109bc002
Fixed localization conflicts
...
#rb none
#rnx
[CL 9480363 by Jamie Dale in Main branch]
2019-10-08 16:16:36 -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
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
bob tellez
bd41767067
#UE4 Disable CanContainContent in a few plugins that have no assets or maps so they dont appear in the content browser.
...
#ROBOMERGE-SOURCE: CL 8352044 via CL 8359277
#ROBOMERGE-BOT: (v401-8057353)
[CL 8360258 by bob tellez in Main branch]
2019-08-27 22:01:54 -04:00
Josh Markiewicz
d79515867d
Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
...
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none
[CL 8321295 by Josh Markiewicz in Main branch]
2019-08-26 18:35:22 -04:00
max chen
26517806b1
Curve Editor: Fix bug in transform tool where stacked view bounds were continuously updated during drag operation
...
#jira UE-79168
#rb max.chen, matt.hoffman
#lockdown cristina.riveron
#ROBOMERGE-SOURCE: CL 8239006 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)
[CL 8239010 by max chen in Main branch]
2019-08-23 17:38:45 -04:00
matt hoffman
34ecb64fff
The curve editor transform tool no longer trips an ensure if views are switched while you have a selection.
...
#jira UE-74427
#rb Max.Chen
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: matt.hoffman
#ROBOMERGE-SOURCE: CL 6956028 via CL 6957763 via CL 6970814
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)
[CL 7084906 by matt hoffman in Dev-Anim branch]
2019-06-18 23:46:18 -04:00
matt hoffman
650a08b766
Changes the snapping behavior in the Curve Editor to lock onto the first direction you move after pressing shift, instead of the bigger axis you've moved from. Releasing shift and then pressing again will allow you to change which direction you are locked onto.
...
#jira UE-75644
#rb Max.Chen
#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: matt.hoffman
#ROBOMERGE-SOURCE: CL 6942681 via CL 6945404 via CL 6947005
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)
[CL 7083804 by matt hoffman in Dev-Anim branch]
2019-06-18 22:55:28 -04:00
matt hoffman
a8db0e2ce2
The curve editor transform tool no longer trips an ensure if views are switched while you have a selection.
...
#jira UE-74427
#rb Max.Chen
#ROBOMERGE-SOURCE: CL 6956028 via CL 6957763
#ROBOMERGE-BOT: (v367-6836689)
[CL 6970814 by matt hoffman in Main branch]
2019-06-13 11:54:25 -04:00