Commit Graph

117 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
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
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
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
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
helge mathee
d8ccb3d794 Control Rig MVC Refactoring
Merging

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

to //Fortnite/Main/...

[FYI] lina.halper


#ROBOMERGE-SOURCE: CL 6597997 via CL 6601432
#ROBOMERGE-BOT: (v351-6581450)

[CL 6601520 by helge mathee in Main branch]
2019-05-21 19:25:23 -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
Matt Kuhlenschmidt
fddbe0a896 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -04:00
helge mathee
ec74f1a9d2 Merging
//Tasks/Fortnite/Dev-UEA-ControlRig/Engine/...

to //Fortnite/Main/Engine/...

Original CL: 6081637

#jira: UEA-490
#rb lina.halper


#ROBOMERGE-SOURCE: CL 6098916 via CL 6100686

[CL 6100754 by helge mathee in Main branch]
2019-04-25 18:03: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
976d118f05 Add a physics setting to stop simulating anim dynamics if the timestep is below a threshold.
#rb Steven.Barnett
[FYI] Lina.Halper


#ROBOMERGE-SOURCE: CL 6019009 via CL 6019011 via CL 6019212 via CL 6019249 via CL 6023326

[CL 6023427 by satchit subramanian in Main branch]
2019-04-19 17:40:16 -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
helge mathee
10ecabbac1 Merging using Fortnight-Main<->Dev-Anim
#rb lina.halper


#ROBOMERGE-SOURCE: CL 5352142 via CL 5354528

[CL 5354644 by helge mathee in Main branch]
2019-03-08 18:39:36 -05: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
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -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