Commit Graph

165 Commits

Author SHA1 Message Date
Ben Marsh
dece8de2d2 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5095547 by Ben Marsh in Dev-Build branch]
2019-02-20 15:06:37 -05:00
Ben Marsh
0f79d0e564 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4979967 by Ben Marsh in Dev-Build branch]
2019-02-12 21:08:26 -05:00
Ben Marsh
ef2c7066f2 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4957620 by Ben Marsh in Dev-Build branch]
2019-02-09 14:49:54 -05:00
Ben Marsh
c34dc5a8cf Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4932473 by Ben Marsh in Dev-Build branch]
2019-02-07 10:01:58 -05:00
Ben Marsh
43317388da Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4867651 by Ben Marsh in Dev-Build branch]
2019-02-01 11:34:13 -05:00
Ben Marsh
bbb8057a5e Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4820573 by Ben Marsh in Dev-Build branch]
2019-01-26 14:33:56 -05:00
Ben Marsh
a3e87004d6 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4783611 by Ben Marsh in Dev-Build branch]
2019-01-23 10:59:53 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
0dc210bca6 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4662233 by Ben Marsh in Dev-Build branch]
2018-12-14 12:51:26 -05:00
Ben Marsh
8346d5c50a Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4634893 by Ben Marsh in Dev-Build branch]
2018-12-05 18:59:28 -05:00
Ben Marsh
fd83293f05 Fix missing or incorrect copyright notices.
#rb none
#rnx

[CL 4593740 by Ben Marsh in Dev-Build branch]
2018-11-26 16:46:35 -05:00
Ben Marsh
b0da1f4fe7 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]
2018-11-19 10:12:17 -05:00
Ben Marsh
2730e47c57 Fixes for compiling the editor with -StressTestUnity enabled, caused by symbols being declared in multiple files, etc...
#rb none

[CL 4508674 by Ben Marsh in Dev-Build branch]
2018-10-25 15:56:09 -04:00
Ben Marsh
0f022f2f46 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4502641 by Ben Marsh in Dev-Build branch]
2018-10-24 13:03:31 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Thomas Sarkanen
1e7e640655 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4324949
#rb none
#jira none

[CL 4325359 by Thomas Sarkanen in Dev-Anim branch]
2018-08-29 04:31:11 -04:00
Thomas Sarkanen
d74610993f Fix incorrect interpolations when using URO and CopyPoseFromMesh
This ensures that CopyPoseFromMesh uses the correct target pose to inteprolate to, rather than the already-interpolated output pose.

#jira UE-62588 - URO is incompatible with CopyPoseFromMesh in certain circumstances
#rb Jurre.DeBaare

[CL 4325358 by Thomas Sarkanen in Dev-Anim branch]
2018-08-29 04:30:15 -04:00
Max Chen
bcd4fca2aa Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4310329 by Max Chen in Dev-Sequencer branch]
2018-08-22 23:23:30 -04:00
Lina Halper
3d9cb289b3 Copying //UE4/Dev-AnimPhys to Dev-Main (//UE4/Dev-Main)
#rb: none
#code review: Martin.Wilson
#lockdown: Thomas.Sarkanen

[CL 4309299 by Lina Halper in Main branch]
2018-08-22 17:31:35 -04:00
Max Chen
2b62035855 Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
#rb none

[CL 4294219 by Max Chen in Dev-Sequencer branch]
2018-08-16 17:14:49 -04:00
Thomas Sarkanen
a712d3b146 Fixup fallout from Main merge
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4286977 by Thomas Sarkanen in Dev-Anim branch]
2018-08-15 08:58:12 -04:00
Thomas Sarkanen
6621552a0c Anim graph root node is now hooked up at class Link() time
This ensures that the index/ptr is self-consistent with the compiled graph properties.
Added a new anim graph node and anim node that StateResult node suse now. No funcitonal change, but a different inheritance/data hierarchy. Added some mismatched tag handling for serialization to deal with upgrading old content.
Added a Dev-Anim object version header.

#rb Benn.Gallagher
#jira UE-42662 - Investigate how to verify root property in AnimBlueprintGeneratedClass

[CL 4275035 by Thomas Sarkanen in Dev-Anim branch]
2018-08-10 10:25:16 -04:00
Max Chen
224d7f9d3c Sequencer: Revert update on bind because it will be updated in the sequencer template if the pose hasn't been ticked yet. See 4229000
#jira UE-62639
#rb none
#fyi martin.wilson, lina.halper

[CL 4272085 by Max Chen in Dev-Sequencer branch]
2018-08-09 12:20:27 -04:00
Thomas Sarkanen
fb17fe7548 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4258917
#rb none
#jira none
#fyi Laurent.Delayen

[CL 4261244 by Thomas Sarkanen in Dev-Anim branch]
2018-08-06 05:09:51 -04:00