Commit Graph

320 Commits

Author SHA1 Message Date
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
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
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
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
thomas sarkanen
00beb65e13 Fix copyright notice
#jira UE-74972 - //UE4/Main - Check Copyright Notices - Missing copyright boilerplate for AnimBlueprintPinInfoDetails.cpp
#rb none

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

[CL 6740265 by thomas sarkanen in Dev-Anim branch]
2019-05-31 16:57:24 -04:00
helge mathee
3518277ab3 PoseDriver: Add checkbox for enabling / disabling cone drawing
#jira UE-72034

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6609494 via CL 6610176 via CL 6610209
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6737367 by helge mathee in Dev-Anim branch]
2019-05-31 16:24:58 -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
helge mathee
b784570012 Control Rig MVC Refactoring
Merging

//Tasks/Fortnite/Dev-UEA-ControlRig/...

to //Fortnite/Main/...

[FYI] lina.halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6597997 via CL 6601432 via CL 6601520
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6711001 by helge mathee in Dev-Anim branch]
2019-05-31 14:00:53 -04:00
helge mathee
4ea83b431b Constraint node NOTE remains when the weight values are set to 1
#jira UE-72251
#rb myself
[FYI] lina.halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6595547 via CL 6596175 via CL 6596182
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6706733 by helge mathee in Dev-Anim branch]
2019-05-31 13:39:59 -04:00
Marc Audy
6fb39af50b Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 6662737
#rb
#rnx

[CL 6664141 by Marc Audy in Dev-Framework branch]
2019-05-29 11:33:11 -04:00
Ben Zeigler
d49e1c1147 #jira UE-74883 Fix local variables to work correctly after compiling
Pin fixup was being skipped, and was using the wrong parameters for export text
Added object owner parameter to BlueprintEditorUtils functions so they transfer text properly, deleted manual fixup
Change local variable diffing to use new cache, so text data is diffed properly
#rb marc.audy

[CL 6598686 by Ben Zeigler in Dev-Framework branch]
2019-05-21 16:03:16 -04:00
Thomas Sarkanen
0446365f17 More fixes for anim montages
Object graph pins now support DisallowedClasses.
Exposed node property pin metadata correctly in anim nodes.
Fixed ensures in sequence player.

#jira UE-65838 - Supplying a montage to a sequence player can crash
#rb Jurre.deBaare

[CL 6534131 by Thomas Sarkanen in Dev-Anim branch]
2019-05-16 09:58:37 -04:00
Thomas Sarkanen
c53375859a Hardened asset players against playing montages
#jira UE-65838 - Supplying a montage to a sequence player can crash
#rb Jurre.deBaare

[CL 6533710 by Thomas Sarkanen in Dev-Anim branch]
2019-05-16 08:57:13 -04:00
Thomas Sarkanen
a622505db9 Guarded against NULL (probably garbage-collected) assets when creating the BP action database
#jira UE-74147 - [CrashReport] UE4Editor-AnimGraph!UAnimGraphNode_SequencePlayer::GetMenuActions(FBlueprintActionDatabaseRegistrar &) [AnimGraphNode_SequencePlayer.cpp:202]
#rb Jurre.deBaare

[CL 6533601 by Thomas Sarkanen in Dev-Anim branch]
2019-05-16 08:19:38 -04:00