Commit Graph

342 Commits

Author SHA1 Message Date
Chris Gagnon
6f65d35a7a Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) in prep for copy up
#rb none

[CL 8563299 by Chris Gagnon in Dev-Editor branch]
2019-09-06 19:11:19 -04:00
thomas sarkanen
5f1ea7fd0e Fix crash when building layered animation blueprints
Ungrouped layers no longer attempt to create a single instance per 'group' (as there isnt really a group at all). This means that init/update calls are now correctly paired.
This unblocks us to work on developing the layering system more, but needs discussion as to how we develop this in the future.
Also fix odd alightment issue with layer interface details.

#rb Jurre.deBaare


#ROBOMERGE-SOURCE: CL 8420328 via CL 8424969
#ROBOMERGE-BOT: (v404-8404397)

[CL 8425119 by thomas sarkanen in Main branch]
2019-09-03 11:26:06 -04:00
Max Chen
719222de61 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 8153426 by Max Chen in Dev-Editor branch]
2019-08-21 00:20:50 -04:00
Marc Audy
1c3be81dca Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7950634
#rb
#rnx

[CL 7950994 by Marc Audy in Dev-Framework branch]
2019-08-12 12:52:39 -04:00
Rex Hill
71bb23594b ToolMenus, simplify add sub menu API to not require menu's name
#rb none
#rnx

[CL 7908995 by Rex Hill in Dev-Editor branch]
2019-08-08 18:19:41 -04:00
Rex Hill
dc107df197 Graph Editor node menus converted to ToolMenus
#rb none
#rnx

[CL 7900622 by Rex Hill in Dev-Editor branch]
2019-08-08 16:32:13 -04:00
Rex Hill
44507f764d Graph Editor Context Menus refactored as ToolMenus
#rb lauren.ridge
#jira UETOOL-1497

[CL 7886478 by Rex Hill in Dev-Editor branch]
2019-08-08 12:51:48 -04:00
Lauren Ridge
882abc56c8 Refactoring the majority of AssetEditorManager cases to AssetEditorSubsystem
#rb me

[CL 7765218 by Lauren Ridge in Dev-Editor branch]
2019-08-05 12:16:07 -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
Marc Audy
f3f7604cd4 Merge UE4/Main to Dev-Framework @ 7329145
#rb
#rnx

[CL 7415594 by Marc Audy in Dev-Framework branch]
2019-07-17 12:57:46 -04:00
lina halper
539d6bd684 - Change ensure to Log since this could happen by editing control rig BP externally
- Also cleared non existing IO mapping in editor if found
- I still leave the log because this can happen in game if somebody changes the ControlRig without modifying the mapping
- New ticket for https://jira.it.epicgames.net/browse/UE-77080 to fix for longer term

#jira: UE-75070, UE-76892
#rb: Helge.Mathee

#ROBOMERGE-SOURCE: CL 7266961 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7266978 by lina halper in Main branch]
2019-07-10 17:06:13 -04:00
Marc Audy
278eda75dd Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 7234503
#rb
#rnx

[CL 7263339 by Marc Audy in Dev-Framework branch]
2019-07-10 13:47:03 -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
Ben Hoffman
ffad63c625 Update references to bCanRenameNode to GetCanRenameNode()
#jira none
#RB none

[CL 7112847 by Ben Hoffman in Dev-Framework branch]
2019-06-20 18:11:19 -04:00
Michael Lentine
f9b3324b32 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 6903150
#rb none
#rnx

[CL 6903163 by Michael Lentine in Main branch]
2019-06-08 17:15:34 -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
Lina Halper
c9ff6867af Back out changelist 6426679
fail jira - UE-72441

- this changes behavior severly and it is not desirable at this point without proper investigation.
- reverting change 6426679

#jira: UE-75736
#fyi: Laurent.Delayen, Braeden.Shosa
#lockdown thomas.sarkanen
#rb:none

[CL 6858462 by Lina Halper in Dev-Anim branch]
2019-06-05 22:31:10 -04:00
Lina Halper
f9900fada5 Fix build error
#jira: UE-75553
#rb: Steve.Robb
#lockdown thomas.sarkanen

[CL 6848193 by Lina Halper in Dev-Anim branch]
2019-06-05 10:14:36 -04:00
Chris Gagnon
0a9f86357f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
Marc Audy
cf48c338c5 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6834564
#rb
#rnx
#lockdown Michael.Noland

[CL 6834940 by Marc Audy in Dev-Framework branch]
2019-06-04 09:58:36 -04:00
stefan boberg
7f1f94b842 Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6821478 by stefan boberg in Dev-Anim branch]
2019-06-03 19:17:40 -04:00
jurre debaare
bf8685c4e4 Warning occurred in Static Analysis Win64 (PVS-Studio): 'animgraphnode_layer.cpp'
#rb trivial

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6675153 via CL 6675212 via CL 6675224
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6789585 by jurre debaare in Dev-Anim branch]
2019-06-03 07:05:21 -04:00
jurre debaare
84bcca119b Unable to use cached poses in animation states
#fix Make sure we keeping traversing the outer chain rather than early out if we come across something other than a EdGraph
#rb Martin.Wilson

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6653027 via CL 6653606 via CL 6654557
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6759327 by jurre debaare in Dev-Anim branch]
2019-05-31 19:39:10 -04:00
thomas sarkanen
018e7e6875 Fix exposed variables not appearing for layer nodes
#rb none
#rnx
[FYI] Aaron.Cox,Laurent.Delayen,Jurre.deBaare

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6628953 via CL 6632144 via CL 6632303
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6749340 by thomas sarkanen in Dev-Anim branch]
2019-05-31 18:09:53 -04:00
thomas sarkanen
c30e8a9501 Layer nodes can now only select from the interfaces/layers that are in the current animation blueprint
Slight change to the runtime behaviour: when running a layer with the same class as its hosting BP, we use a 'self' layer rather than outputting a warning.

#rb Jurre.deBaare
[FYI] Jurre.daBaare, Aaron.Cox, Laurent.Delayen
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6628708 via CL 6629035 via CL 6629054
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748631 by thomas sarkanen in Dev-Anim branch]
2019-05-31 18:05:29 -04:00