Commit Graph

226 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
Marc Audy
a7459b1afc Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 8292949
#rb
#rnx

[CL 8293622 by Marc Audy in Dev-Framework branch]
2019-08-26 10:30:04 -04:00
Ben Hoffman
c11e10eb9c Add 0 entries to animtion enums to prevent blueprint compiler warnings.
Enums affected:
- ESplineBoneAxis
- EAnimAssetCurveFlags

#rb Lina.Halper
#rnx
#jira UE-59679

[CL 8293282 by Ben Hoffman in Dev-Framework branch]
2019-08-26 09:50:02 -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
ludovic chabant
e57f12f56c Fix some bugs with sequencer anim-nodes and anim-notifies not firing correctly in various cases.
- Provide the previous/next times to the anim-node so it can make the animation system update that whole time range, including when the node is resetting.
- Do the same thing for the anim-montage update, because when time loops around back to 0, it was updating backwards and firing notifies incorrectly.

Disable anim-notifies when scrubbing because we currently can't make all cases work consistently.

There are some other edge cases that are not solved by this CL yet, though.

#jira UE-70926
#jira UE-77768
#rb laurent.delayen, mike.zyracki, max.chen

[CL 8093828 by ludovic chabant in Dev-Editor branch]
2019-08-16 13:07:50 -04:00
lina halper
0a9a38c68d Remove unused variables
#jira: UE-78921
#rb: Helge.Mathee
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8062117 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v400-8057353)

[CL 8062123 by lina halper in Main branch]
2019-08-15 13:21:37 -04:00
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
Benn Gallagher
3a4873ef60 Copying //UE4/Dev-Physics to Dev-Main (//UE4/Dev-Main) @ 7703071
#rb
#rnx

[CL 7705805 by Benn Gallagher in Main branch]
2019-08-02 09:01:58 -04:00
Helge Mathee
bf2aef7b8f AnimNode_AnimDynamics: Build break on Mac
#jira UE-78044
#rb none

[CL 7651300 by Helge Mathee in Main branch]
2019-07-29 14:31:53 -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
lina halper
ee12621755 Crash fix on AD node with invalid set up
#jira: UE-77592
#rb:Laurent.Delayen

#ROBOMERGE-SOURCE: CL 7573040 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7573049 by lina halper in Main branch]
2019-07-23 15:57:16 -04:00
braeden shosa
a60e5fb0f3 Fixed pose exploding when chaining multiple Blend Multi nodes together. FAnimNode_MultiWayBlend uses scratch arrays to build up input pose data before blending all the poses together. But when multiple Blend Multi nodes were chained together they would stomp on each other by resetting the arrays on entry. Now the scratch arrays are treated like stacks and we push each source pose's data and pop what was added before leaving the evaluate call.
#rb Martin.Wilson
[FYI] Martin.Wilson,  Lina.Halper, Laurent.Delayen, Aaron.Cox
[RN] fix Animation Fixed bad pose output when chaining multiple Blend Multi nodes together.


#ROBOMERGE-OWNER: braeden.shosa
#ROBOMERGE-AUTHOR: braeden.shosa
#ROBOMERGE-SOURCE: CL 7325745 via CL 7325985 via CL 7342184
#ROBOMERGE-BOT: (v371-7306989)

[CL 7396026 by braeden shosa in Main branch]
2019-07-17 10:04:53 -04:00
helge mathee
a6a2a333c0 Final copy-up for Control Rig Task Stream.
Merging using Fortnite_Main<->Fortnite_ControlRig

#rb none


#ROBOMERGE-OWNER: helge.mathee
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 7321580 via CL 7323175
#ROBOMERGE-BOT: (v371-7306989)

[CL 7323351 by helge mathee in Main branch]
2019-07-16 11:49:59 -04:00
mike zyracki
6c525fe7cd Add bWasCreated flag to BindToSkeletalMesh so when we know when we create the sequencer anim instance we should save the pose. This removes the need for control rig to override NativeInitialization. Also add some checks to make sure we save a valid pose.
#jira UE-76569

#rb max.chen

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

[CL 7280144 by mike zyracki in Main branch]
2019-07-11 15:56:39 -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
satchit subramanian
ecbdae5c54 Add asset info to AnimNode_Rigidbody.
#rb Michael.Lentine


#ROBOMERGE-SOURCE: CL 7041340 via CL 7042232 via CL 7047490
#ROBOMERGE-BOT: (v367-6836689)

[CL 7048351 by satchit subramanian in Main branch]
2019-06-17 13:58:21 -04:00
braeden shosa
eb090a4b0d Workaround for CurvePoseIndex out of bounds crash
[CODEREVIEW] Lina.Halper, Laurent.Delayen, Aaron.Cox
#rnx


#ROBOMERGE-SOURCE: CL 7014082 via CL 7016740 via CL 7016747 via CL 7016816 via CL 7020855
#ROBOMERGE-BOT: (v367-6836689)

[CL 7020952 by braeden shosa in Main branch]
2019-06-14 19:46:23 -04:00
aaron cox
3618478716 Reinitialize the Copy Pose From Mesh node when the target mesh changes.
Fixes animation pose breaking when dynamically changing between skeletal meshes that use the same animbp but have a different number of bones.
[CODEREVIEW] Laurent.Delayen, Lina.Halper


#ROBOMERGE-SOURCE: CL 6938273 via CL 6938276 via CL 6938281 via CL 6938283 via CL 6943622
#ROBOMERGE-BOT: (v366-6836689)

[CL 6946612 by aaron cox in Main branch]
2019-06-11 22:52:01 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -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
Max Chen
58ed55be26 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none
#lockdown nick.penwarden

[CL 6863746 by Max Chen in Dev-Sequencer branch]
2019-06-06 13:46:20 -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
Max Chen
62e9e36c62 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 6729326 by Max Chen in Dev-Sequencer branch]
2019-05-31 15:38:50 -04:00
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
Max Chen
65cea2234e Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 6662567 by Max Chen in Dev-Sequencer branch]
2019-05-29 01:56:53 -04:00