Commit Graph

76 Commits

Author SHA1 Message Date
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
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
Jeff Farris
88d3c0c302 Editgrating 14474663 to UE5 to fix spline component crash (In spline details customization, update the active spline visualizer when a point is initially selected rather than when customization is created.)
#fyi christina.temlelaarl

[CL 14519268 by Jeff Farris in ue5-main branch]
2020-10-19 18:03:35 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
michael daum
7c6d7b3ab2 Drastically reduce the number of targets depending on UnrealWidget.h
#rb lauren.barnes

[CL 14266936 by michael daum in ue5-main branch]
2020-09-07 20:36:09 -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
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
robert manuszewski
b7568cc694 Fix for UE-90683: You can no longer delete conflicting variables
Refactored FindField into FindUField and FindFProperty to avoid confusion caused by the fact that FindField<UField> will no longer return FProperties.

#jira UE-90683
#rb Steve.Robb
#tests Basic editor functionality test, cooked and ran PC client and server, bot soak tests for two hours

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 12190998 in //UE4/Release-4.25/... via CL 12190999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12191300 by robert manuszewski in Main branch]
2020-03-15 10:33:45 -04:00
jason stasik
ae71fb435d Check selected spline keys before trying to render them
#jira UE-89624
#rb matt.kuhlenschmidt

#ROBOMERGE-SOURCE: CL 11774837 in //UE4/Release-4.25/... via CL 11774894
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776830 by jason stasik in Main branch]
2020-02-28 16:05:00 -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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
christina tempelaarl
721566f33c Fix selected spline tangent color.
#jira UE-83412
#rb richard.talbotwatkin

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

[CL 10113643 by christina tempelaarl in Main branch]
2019-11-12 12:18:05 -05:00
richard talbotwatkin
014f04b394 Fix to SplineComponentVisualizer so that it handles external code changing the number of spline points from underneath it.
#jira UE-58680
#rb none

#ROBOMERGE-SOURCE: CL 9886489 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v553-9872581)

[CL 9886492 by richard talbotwatkin in Main branch]
2019-10-29 17:04:14 -04:00
richard talbotwatkin
97ad3e77cc Fixed spline component visualizer regression; extra line thickness was stopping spline point hit proxy from being hit.
#jira UE-82065
#rb none

#ROBOMERGE-SOURCE: CL 9692995 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v538-9681622)

[CL 9693012 by richard talbotwatkin in Main branch]
2019-10-18 13:46:13 -04:00
Max Chen
2d08f6becd Spline Generation: Window does not support maximize/minimize
#jira UE-81107
#rb none

[CL 9619145 by Max Chen in 4.24 branch]
2019-10-16 11:56: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
christina tempelaarl
924aab1f49 Increase spline hit testing tolerance for spline component hit proxies. QOL fix.
#jira UE-76282
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 9403866 via CL 9403867
#ROBOMERGE-BOT: (v456-9359915)

[CL 9405951 by christina tempelaarl in Main branch]
2019-10-03 16:35:57 -04:00
christina tempelaarl
872bebb7e9 Fix spline component visualizer Focus Selected menu item. Interpolate spline component metadata when adding point to segment with right-click.
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 9317880 via CL 9317891
#ROBOMERGE-BOT: (v455-9298202)

[CL 9317893 by christina tempelaarl in Main branch]
2019-10-01 13:02:16 -04:00
christina tempelaarl
9b80a2751c Changes to facilitate derived spline component visualizers.
#jira UE-76282
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 9248925 via CL 9248984
#ROBOMERGE-BOT: (v443-9013191)

[CL 9248988 by christina tempelaarl in Main branch]
2019-09-27 19:19:41 -04:00
christina tempelaarl
5ee627f4e4 Fixed improper handling of closed-loop splines, added more checks.
#rb matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 8926189 via CL 8926221
#ROBOMERGE-BOT: (v429-8924992)

[CL 8926228 by christina tempelaarl in Main branch]
2019-09-20 09:27:55 -04:00
nicolas nebel
12bea1f911 Add missing include in SplineComponentVisualizer.cpp
#rb none


#ROBOMERGE-SOURCE: CL 8657457 via CL 8667299
#ROBOMERGE-BOT: (v417-8656536)

[CL 8668382 by nicolas nebel in Main branch]
2019-09-12 20:14:33 -04:00
Max Chen
caaeef3ea7 Spline Component: Fix const delegate deprecation warning
#jira UE-80144
#rb nicolas.nebel

[CL 8658145 by Max Chen in Main branch]
2019-09-12 14:06:30 -04:00
patrick enfedaque
23d165f5aa Fix Mac Compile Warnings
#rb none
[FYI] bob.tellez
#rnx


#ROBOMERGE-SOURCE: CL 8634514 via CL 8636867
#ROBOMERGE-BOT: (v410-8635924)

[CL 8636870 by patrick enfedaque in Main branch]
2019-09-11 10:47:06 -04:00
nicolas nebel
84a00a91a7 Tools: Add panel to spline context menu to easily create simple shapes with splines, add options to set visibliity and scale of the cine rail preview mesh
#rb christina.tempelaarl, max.chen


#ROBOMERGE-SOURCE: CL 8614943 via CL 8629397
#ROBOMERGE-BOT: (v409-8614070)

[CL 8631380 by nicolas nebel in Main branch]
2019-09-10 21:03:06 -04:00