Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -04:00
satchit subramanian
5a67027867 [FYI] Benn.Gallagher
Add option to simulate rigidbody animnodes in the frame in which they're reset (effectively skipping forward a frame).


#ROBOMERGE-SOURCE: CL 6431438 via CL 6431522 via CL 6432480

[CL 6442365 by satchit subramanian in Main branch]
2019-05-14 09:09:23 -04:00
Chris Gagnon
56e73ed431 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -04:00
satchit subramanian
dd850b85cb Add setting to stop simulating rigidbody nodes below a minimum timestep.
#rb Steven.Barnett
[FYI] Lina.Halper


#ROBOMERGE-SOURCE: CL 6023527 via CL 6023529 via CL 6023813 via CL 6023852 via CL 6024825

[CL 6024947 by satchit subramanian in Main branch]
2019-04-19 20:21:02 -04:00
satchit subramanian
886c3821ab Fix clamp linear translation limit causing jittering in some assets.
[FYI] Benn.Gallagher


#ROBOMERGE-SOURCE: CL 5768103 via CL 5768104 via CL 5768828 via CL 5770632

[CL 5770745 by satchit subramanian in Main branch]
2019-04-05 19:59:27 -04:00
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
thomas sarkanen
28b1d26b2d Misc bugfixes & improvements to animation budget allocator
Added force params to allow debugging of frame skip/interpolation issues.
Fixed rigid body node being continually reset when running external frame skips.

#rb Jurre.deBaare


#ROBOMERGE-SOURCE: CL 5424932 via CL 5432591

[CL 5432738 by thomas sarkanen in Main branch]
2019-03-18 13:23:02 -04:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
aaron cox
d12dba2836 [CODEREVIEW] Laurent.Delayen, Lina.Halper
[FYI] Luke.Tannenbaum

Validate BaseBoneRef in Update FAnimNode_RigidBody::IsValidToEvaluate(). Should fix crashes caused by referencing bones that don't exist at some LODs.


#ROBOMERGE-SOURCE: CL 5064673 via CL 5065477

[CL 5066422 by aaron cox in Main branch]
2019-02-19 14:41:41 -05:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00
satchit subramanian
1b776154ff Change default value for FAnimNode_RigidBody::bForceDisableCollisionBetweenConstraintBodies
to be false in order to not break existing assets.


#ROBOMERGE-SOURCE: CL 4691097

[CL 4691100 by satchit subramanian in Main branch]
2019-01-08 19:14:21 -05:00
lina halper
3c3dfd4626 Moved CreateConstraint out of disable collision if statement
================================
[FYI] Satchit.Subramanian

#jira:none


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4669256

[CL 4689399 by lina halper in Main branch]
2019-01-08 14:00:07 -05:00
Marc Audy
ab108c215e Copying to Dev-Main @ CL# 4688301
#rb
#rnx

[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Matt Kuhlenschmidt
7a313bf0eb Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4659626 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-13 17:04:16 -05:00
Michael Lentine
ea5ca985d4 Copying //UE4/Dev-Physics to //UE4/Dev-Main.
#rb none
#lockdown Nick.Penwarden

[CL 4653110 by Michael Lentine in Main branch]
2018-12-12 11:25:29 -05:00
Matt Kuhlenschmidt
cde8160913 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4572510 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-16 11:15:08 -05:00