Commit Graph

293 Commits

Author SHA1 Message Date
lina halper
658c67310e - Change ensure to Log since this could happen by editing control rig BP externally
- Also cleared non existing IO mapping in editor if found
- I still leave the log because this can happen in game if somebody changes the ControlRig without modifying the mapping
- New ticket for https://jira.it.epicgames.net/browse/UE-77080 to fix for longer term

#jira: UE-75070, UE-76892
#rb: Helge.Mathee

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 7266961 in //UE4/Release-4.23/... via CL 7266978
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7339338 by lina halper in Dev-Build branch]
2019-07-16 23:57:26 -04:00
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -04:00
lina halper
bab821de19 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 6861656
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 6863572 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6917136 by lina halper in Dev-Build branch]
2019-06-10 16:16:11 -04:00
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
marc audy
3fc04f1c88 Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 6835245
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 6835252 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6873661 by marc audy in Dev-Build branch]
2019-06-07 05:00:15 -04:00
stefan boberg
285a908f86 Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v365-6733468)

[CL 6821265 by stefan boberg in Dev-Build branch]
2019-06-03 19:09:16 -04:00
jurre debaare
39633a9049 Warning occurred in Static Analysis Win64 (PVS-Studio): 'animgraphnode_layer.cpp'
#rb trivial

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6675153 via CL 6675212 via CL 6675224
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v364-6709755)

[CL 6716820 by jurre debaare in Dev-Build branch]
2019-05-31 14:26:12 -04:00
jurre debaare
d8dfc0439f Unable to use cached poses in animation states
#fix Make sure we keeping traversing the outer chain rather than early out if we come across something other than a EdGraph
#rb Martin.Wilson

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6653027 via CL 6653606 via CL 6654557
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v363-6677109)

[CL 6700756 by jurre debaare in Dev-Build branch]
2019-05-31 12:55:50 -04:00
Ben Marsh
4f8918bbe8 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6646181 by Ben Marsh in Dev-Build branch]
2019-05-26 14:43:21 -04:00
Ben Marsh
f859d880f5 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6631474 by Ben Marsh in Dev-Build branch]
2019-05-24 11:46:39 -04:00
Ben Marsh
5f3ac5bc9e Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6620114 by Ben Marsh in Dev-Build branch]
2019-05-23 13:55:56 -04:00
helge mathee
bfab05cc6e Merging
//Tasks/Fortnite/Dev-UEA-ControlRig/...

to //Fortnite/Main/...

#code review lina.halper

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6083436 via CL 6088204 via CL 6088230
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6117721 by helge mathee in Dev-Build branch]
2019-04-26 21:14:14 -04:00
thomas sarkanen
8a84e08a66 Re-fix old bug that never got merged from 4.21
#jira UE-66389 - [CrashReport] UE4Editor_CoreUObject!CastLogError() [casts.cpp:11]
#rb Martin.Wilson

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 5834604 via CL 5838048 via CL 5838470
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5892800 by thomas sarkanen in Dev-Build branch]
2019-04-14 07:11:48 -04:00
lina halper
df2a9b5159 Layer node initialization fix
#rb: Martin.Wilson
#jira: FORT-113893

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5768200 via CL 5768201 via CL 5768840 via CL 5770648 via CL 5770764
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5780945 by lina halper in Dev-Build branch]
2019-04-08 13:25:41 -04:00
helge mathee
2226b8738e AnimNode Constraint: Adding note about weight not adding up to 1.0
Originally proposed as a warning - we decided to make it a note to avoid content from throwing errors during cook.

#rb lina.halper

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 5690207 via CL 5694364 via CL 5694554
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5699632 by helge mathee in Dev-Build branch]
2019-04-02 21:05:07 -04:00
bob tellez
e5545603c5 Back out changelist 5229480. Cook warnings. This warning is good but we have to fix content before enabling it.
[FYI] Helge.Mathee

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5235478 via CL 5239414 via CL 5239495
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5251537 by bob tellez in Dev-Build branch]
2019-02-28 17:46:24 -05:00
helge mathee
ca85793a24 #rb Aaron.Cox
Added a warning message to the AnimGraphNode_Constraint to flag nodes which don't have normalized weights. A screenshot can be seen in the jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 5229480 via CL 5236126 via CL 5236245
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5250559 by helge mathee in Dev-Build branch]
2019-02-28 17:39:22 -05:00
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
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
e26dfd2100 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4716250 by Ben Marsh in Dev-Build branch]
2019-01-12 13:09:07 -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
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