Commit Graph

65 Commits

Author SHA1 Message Date
rex hill
282894a3d7 Blueprint Editor menus converted into tool menus
#rb Thomas.Sarkanen
[FYI] Phillip.Kavan
#rnx


#ROBOMERGE-SOURCE: CL 11115852 via CL 11115853 via CL 11115855
#ROBOMERGE-BOT: (v640-11091645)

[CL 11115859 by rex hill in Main branch]
2020-01-27 10:57:54 -05:00
Ryan Durand
54168a659e Updating more copyrights to remove years.
#rnx
#rb none
#jira none

[CL 10898929 by Ryan Durand in Main branch]
2020-01-07 17:07:47 -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
rex hill
9740d40c82 Fix a merge issue
#rb none
#rnx
#jira


#ROBOMERGE-SOURCE: CL 9969992 via CL 9970149
#ROBOMERGE-BOT: (v560-9963197)

[CL 9970150 by rex hill in Main branch]
2019-11-04 13:37:38 -05:00
rex hill
62bc081d51 Brought over changes related to Tool Menus
#rnx
#rb none


#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 9968254 via CL 9968365
#ROBOMERGE-BOT: (v560-9963197)

[CL 9969240 by rex hill in Main branch]
2019-11-04 12:21:36 -05:00
thomas sarkanen
b66164bbc3 Removed more checking code that assumes graphs are always contained within a blueprint
#jira UE-80602 - Crash occurs when deleting an Animation Layer containing a State Machine
#rb Jurre.deBaare

#ROBOMERGE-SOURCE: CL 9731459 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9731482 by thomas sarkanen in Main branch]
2019-10-21 10:15:56 -04:00
Lina Halper
3fd7f76532 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main)
#fyi: Laurent.Delayn, Marc.Audy
#rb: none

[CL 9321182 by Lina Halper in Main branch]
2019-10-01 16:59:31 -04:00
thomas sarkanen
79185e6271 Correctly displaying current class on layer nodes
This change means that layer nodes can now display their (potentially dynamically-assigned) linked class when the debugger is inspecting a running instance.

#jira UE-78537 - UX: There is no clear indication what Instance Class is used on a layer node without selecting it
#rb Jurre.deBaare


#ROBOMERGE-SOURCE: CL 9133145 via CL 9133206
#ROBOMERGE-BOT: (v443-9013191)

[CL 9133270 by thomas sarkanen in Main branch]
2019-09-26 09:15:50 -04:00
thomas sarkanen
53708c2257 Renaming layer and sub-instance related APIs
#jira UE-80147 - Rename new anim layer related APIs
#rb Jurre.deBaare


#ROBOMERGE-OWNER: thomas.sarkanen
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 8973946 via CL 8973950 via CL 8973951
#ROBOMERGE-BOT: (v438-8971340)

[CL 8974019 by thomas sarkanen in Main branch]
2019-09-23 07:23:26 -04:00
Marc Audy
8df336162c Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) @ 8782600
#rb
#rnx

[CL 8783278 by Marc Audy in Main branch]
2019-09-17 19:12:19 -04:00
thomas sarkanen
8e225aa3f0 Fixed linux compile error
#rb none
#rnx


#ROBOMERGE-OWNER: thomas.sarkanen
#ROBOMERGE-AUTHOR: braeden.shosa
#ROBOMERGE-SOURCE: CL 8681827 via CL 8688664
#ROBOMERGE-BOT: (v422-8689730)

[CL 8692986 by thomas sarkanen in Main branch]
2019-09-16 11:34:13 -04:00
Brandon Schaefer
30dc05c345 Fix compile error: '&&' within '||' [-Werror,-Wlogical-op-parentheses]
#jira none
#rb none
#fyi braeden.shosa

[CL 8681184 by Brandon Schaefer in Main branch]
2019-09-13 16:59:27 -04:00
braeden shosa
687a571735 Fixed pointer use before verify static analysis warning
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8657027 via CL 8667256
#ROBOMERGE-BOT: (v417-8656536)

[CL 8667341 by braeden shosa in Main branch]
2019-09-12 19:24:18 -04:00
laurent delayen
c4e1a4e08f Fixed robomerge conflict
#fyi thomas.sarkanen

Add the ability to preview of layer overlays and sub-instances in the animation blueprint editor

This change adds a new 'preview animation blueprint' to UAnimBlueprint. This is a blueprint that hosts a sub-instance/layer BP for preview purposes. Setting this in a BP will show a preview in the viewport of the BP running as a sub-instance of the preview instance, thus allowing for sub-instances to be previewed in context.

#jira UE-78536 - Preview output of animation layers
#rb Jurre.deBaare


#ROBOMERGE-OWNER: laurent.delayen
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 8591775 via CL 8617549
#ROBOMERGE-BOT: (v409-8614070)

[CL 8631092 by laurent delayen in Main branch]
2019-09-10 20:49:17 -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
Lina Halper
b0bdc590d5 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none

[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
thomas sarkanen
953c447204 Copying //Tasks/Fortnite/Dev-AnimSubInstances to Main (//Fortnite/Main)
Adds:
- New sub-instance functionality (dynamic setting, inline evaluation)
- Animation layers (experimental)

#rb Jurre.deBaare
[FYI] Laurent.Delayen
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6604742 via CL 6605911 via CL 6605970
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v364-6709755)

[CL 6719637 by thomas sarkanen in Dev-Anim branch]
2019-05-31 14:37:25 -04:00
thomas sarkanen
bc40812f7a Copying //Tasks/Fortnite/Dev-AnimSubInstances to Main (//Fortnite/Main)
Adds:
- New sub-instance functionality (dynamic setting, inline evaluation)
- Animation layers (experimental)

#rb Jurre.deBaare
[FYI] Laurent.Delayen
#rnx


#ROBOMERGE-SOURCE: CL 6604742 via CL 6605911
#ROBOMERGE-BOT: (v356-6605775)

[CL 6605970 by thomas sarkanen in Main branch]
2019-05-22 12:00:20 -04:00
lina halper
ea9669385d - Fixed memory corruption when adding
- Control Rig node watch support for quick debugging

#rb: Thomas.Sarkanen
#code review: helge.mathee
#jira: none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5533952 via CL 5534171 via CL 5536205
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5545103 by lina halper in Dev-Anim branch]
2019-03-25 17:33:10 -04:00
lina halper
ed5b3dc138 - Fixed memory corruption when adding
- Control Rig node watch support for quick debugging

#rb: Thomas.Sarkanen
#code review: helge.mathee
#jira: none


#ROBOMERGE-SOURCE: CL 5533952 via CL 5534171

[CL 5536205 by lina halper in Main branch]
2019-03-25 14:19:45 -04:00
martin wilson
b2dad39396 Stop blueprint compiler ensuring when we are currently previewing live link
#jira UE-67555
#rb Lina.Halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: martin.wilson
#ROBOMERGE-SOURCE: CL 5353169 in //UE4/Release-4.22/... via CL 5364958
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381716 by martin wilson in Dev-Anim branch]
2019-03-13 09:55:10 -04:00
martin wilson
238f99a689 Stop blueprint compiler ensuring when we are currently previewing live link
#jira UE-67555
#rb Lina.Halper

#ROBOMERGE-SOURCE: CL 5353169 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5364958 by martin wilson in Main branch]
2019-03-11 18:58:56 -04:00
YuchenMei
9b58593734 PR #5547: Hide Unrelated Nodes Blueprints Editor Feature (Contributed by YuchenMei)
#rb me

[CL 5112201 by Lauren Ridge in Dev-Editor branch]
2019-02-21 15:00:31 -05:00