Commit Graph

11 Commits

Author SHA1 Message Date
thomas sarkanen
7f1d9c8926 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-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 5424932 via CL 5432591 via CL 5432738
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5436189 by thomas sarkanen in Dev-Networking branch]
2019-03-18 17:09:43 -04:00
aaron cox
df464ffb6e [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-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: aaron.cox
#ROBOMERGE-SOURCE: CL 5064673 via CL 5065477 via CL 5066422
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5136533 by aaron cox in Dev-Networking branch]
2019-02-22 04:06:35 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4718806 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4718825 by ben marsh in Dev-Networking branch]
2019-01-14 12:15:37 -05:00
satchit subramanian
d75e3790f7 Change default value for FAnimNode_RigidBody::bForceDisableCollisionBetweenConstraintBodies
to be false in order to not break existing assets.

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: satchit.subramanian
#ROBOMERGE-SOURCE: CL 4691097 via CL 4691100
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710536 by satchit subramanian in Dev-Networking branch]
2019-01-11 12:58:49 -05:00
lina halper
b1400cb8b2 Moved CreateConstraint out of disable collision if statement
================================
[FYI] Satchit.Subramanian

#jira:none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4669256 via CL 4689399
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710210 by lina halper in Dev-Networking branch]
2019-01-11 12:49:44 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
2019-01-11 02:57:03 -05:00
ben marsh
2b46ba7b94 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4662404 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4662413 by ben marsh in Dev-Networking branch]
2018-12-14 13:44:01 -05:00
ryan gerleve
9843ebaa9f Merging conflict by hand.
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1


--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4653305 by ryan gerleve in Dev-Networking branch]
2018-12-12 11:43:42 -05:00
ryan gerleve
289a4fa159 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4567513 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4573136 by ryan gerleve in Dev-Networking branch]
2018-11-16 14:01:06 -05:00
Ryan Gerleve
9af1fb3463 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx

[CL 4516466 by Ryan Gerleve in Dev-Networking branch]
2018-10-29 10:01:28 -04:00
Ryan Gerleve
bcca42e74a Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
#rb none
#rnx

[CL 4284864 by Ryan Gerleve in Dev-Networking branch]
2018-08-14 15:58:25 -04:00