Commit Graph

199 Commits

Author SHA1 Message Date
Max Chen
719222de61 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 8153426 by Max Chen in Dev-Editor branch]
2019-08-21 00:20:50 -04:00
Rex Hill
dc107df197 Graph Editor node menus converted to ToolMenus
#rb none
#rnx

[CL 7900622 by Rex Hill in Dev-Editor branch]
2019-08-08 16:32:13 -04:00
Rex Hill
44507f764d Graph Editor Context Menus refactored as ToolMenus
#rb lauren.ridge
#jira UETOOL-1497

[CL 7886478 by Rex Hill in Dev-Editor branch]
2019-08-08 12:51:48 -04:00
jurre debaare
68c7c259a2 Animation Layer node doesn't pass through variables found in instanced classes
#fix Reintroduce missing behaviour for generating pin exposing widget in details view for LayerNode
#jira UE-78482
#rb Lina.Halper


#ROBOMERGE-SOURCE: CL 7878471 via CL 7882193
#ROBOMERGE-BOT: (v389-7813075)

[CL 7882233 by jurre debaare in Main branch]
2019-08-08 11:18:26 -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
539d6bd684 - 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-SOURCE: CL 7266961 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7266978 by lina halper in Main branch]
2019-07-10 17:06:13 -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
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
Lina Halper
c9ff6867af Back out changelist 6426679
fail jira - UE-72441

- this changes behavior severly and it is not desirable at this point without proper investigation.
- reverting change 6426679

#jira: UE-75736
#fyi: Laurent.Delayen, Braeden.Shosa
#lockdown thomas.sarkanen
#rb:none

[CL 6858462 by Lina Halper in Dev-Anim branch]
2019-06-05 22:31:10 -04:00
thomas sarkanen
c30e8a9501 Layer nodes can now only select from the interfaces/layers that are in the current animation blueprint
Slight change to the runtime behaviour: when running a layer with the same class as its hosting BP, we use a 'self' layer rather than outputting a warning.

#rb Jurre.deBaare
[FYI] Jurre.daBaare, Aaron.Cox, Laurent.Delayen
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6628708 via CL 6629035 via CL 6629054
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6748631 by thomas sarkanen in Dev-Anim branch]
2019-05-31 18:05:29 -04:00
helge mathee
3518277ab3 PoseDriver: Add checkbox for enabling / disabling cone drawing
#jira UE-72034

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6609494 via CL 6610176 via CL 6610209
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6737367 by helge mathee in Dev-Anim branch]
2019-05-31 16:24:58 -04:00
thomas sarkanen
953c447204 Copying //Tasks/Fortnite/Dev-AnimSubInstances to Main (//Fortnite/Main)
Adds:
- New sub-instance functionality (dynamic setting, inline evaluation)
- Animation layers (experimental)

#rb Jurre.deBaare
[FYI] Laurent.Delayen
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: thomas.sarkanen
#ROBOMERGE-SOURCE: CL 6604742 via CL 6605911 via CL 6605970
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v364-6709755)

[CL 6719637 by thomas sarkanen in Dev-Anim branch]
2019-05-31 14:37:25 -04:00
helge mathee
b784570012 Control Rig MVC Refactoring
Merging

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

to //Fortnite/Main/...

[FYI] lina.halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6597997 via CL 6601432 via CL 6601520
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6711001 by helge mathee in Dev-Anim branch]
2019-05-31 14:00:53 -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
Thomas Sarkanen
0446365f17 More fixes for anim montages
Object graph pins now support DisallowedClasses.
Exposed node property pin metadata correctly in anim nodes.
Fixed ensures in sequence player.

#jira UE-65838 - Supplying a montage to a sequence player can crash
#rb Jurre.deBaare

[CL 6534131 by Thomas Sarkanen in Dev-Anim branch]
2019-05-16 09:58:37 -04:00
projectgheist
664f300fbf PR #5688: Blend poses have pins by default (Contributed by projectgheist)
#jira: UE-72441
#rb: Martin.Wilson

[CL 6426679 by Lina Halper in Dev-Anim branch]
2019-05-13 09:38:52 -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
696df6c607 Merging
//Tasks/Fortnite/Dev-UEA-ControlRig/...

to //Fortnite/Main/...

#code review lina.halper

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6083436 via CL 6088204 via CL 6088230
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6117712 by helge mathee in Dev-Anim branch]
2019-04-26 21:14:10 -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
lina halper
2ab4f326c3 Layer node initialization fix
#rb: Martin.Wilson
#jira: FORT-113893

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5768200 via CL 5768201 via CL 5768840 via CL 5770648 via CL 5770764
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5780890 by lina halper in Dev-Anim branch]
2019-04-08 13:25:23 -04:00
helge mathee
f66e3a5450 Improving the PoseDriver by
* adding debug drawing for the cones used for each target
* adding a new normalization mode using a median cone
* adding overrides for distance method + function type per target
* improving the reloading of the pose list to maintain settings for known poses

#rb Lina.Halper, James.Golding

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 5089485 via CL 5091026 via CL 5091045
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5144737 by helge mathee in Dev-Anim branch]
2019-02-22 11:27:00 -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
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
Thomas Sarkanen
e0f6136524 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
#rb none
#jiira none

[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 04:11:30 -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