Commit Graph

66 Commits

Author SHA1 Message Date
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Michal Valient
95d19f95b1 [REVERB] Merging //UE4/Private-Reverb-Development@13832732
#rb graham.wihlidal, rune.stubbe, brian.karis, andrew.lauritzen, jeff.farris

[CL 13834854 by Michal Valient in ue5-main branch]
2020-07-06 18:58:26 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
simon therriault
c0742d07bd - Fixing time alignment in livelink by having the offset part of the source instead of each subjects
#jira UE-91344, UE-91191
#rb alejandro.arango
#lockdown simon.tourangeau

#ROBOMERGE-SOURCE: CL 12685939 in //UE4/Release-4.25/... via CL 12685949 via CL 12685961
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12685972 by simon therriault in Main branch]
2020-04-08 23:06:42 -04:00
simon therriault
43c07e73f8 Merging livelink fixes from dev-vp
#rb alejandro.arango
#jira UE-91191, UE-89367

#ROBOMERGE-SOURCE: CL 12465207 in //UE4/Release-4.25/... via CL 12465210 via CL 12465335
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12465337 by simon therriault in Main branch]
2020-03-26 22:06:19 -04:00
patrick boutot
e0d774e441 - Updating MediaIO to work with TimedData monitor
- Disabled LiveLink' ValidEngineTime and ValidTimecodeFrame setting by default.
- Add option to set the LiveLink source to Timecode by default.
#rb patrick.boutot, simon.therriault, alejandro.arango
#author simon.therriault, patrick.boutot
#jira none

#ROBOMERGE-SOURCE: CL 11549458 in //UE4/Release-4.25/... via CL 11549463
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11578175 by patrick boutot in Main branch]
2020-02-21 15:04:58 -05:00
Chris Gagnon
09a673c614 Fixes for various merge issues.
#rb none

[CL 11226091 by Chris Gagnon in Main branch]
2020-02-04 19:04:31 -05:00
Chris Gagnon
c3f9a18841 Merge from Main in prep for Dev-Tools-Staging Copy up
#rb none

[CL 11221539 by Chris Gagnon in Dev-Tools-Staging branch]
2020-02-04 17:00:31 -05:00
Thomas Sarkanen
de2be528ca Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

[CL 11214797 by Thomas Sarkanen in Main branch]
2020-02-04 11:06:23 -05:00
Chris Gagnon
76c6bcbfeb UE4 Main merged to Dev-Tools-Staging at CL 11164391
#rb none

[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
2020-01-29 20:39:37 -05:00
Patrick Boutot
b67ff68e04 Copying //UE4/Dev-VirtualProduction to //UE4/Dev-Tools-Staging @ 11168401
#rb none
#rnx

[CL 11170710 by Patrick Boutot in Dev-Tools-Staging branch]
2020-01-29 18:45:15 -05:00
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
2020-01-22 17:58:55 -05:00
Simon Therriault
3ba15d4ccc Timecodesync
- Adding a test map and an actor to validate synchronization of incoming data through livelink and sdi. Locations and colors are used to validate expected data sent from TimeSynchronizationWriter

#rb patrick.boutot

[CL 11064211 by Simon Therriault in Dev-VirtualProduction branch]
2020-01-20 11:00:43 -05:00
Patrick Boutot
410c720ac7 Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx
#author jeanmichel.dignard

[CL 10992634 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-15 09:39:21 -05:00
Patrick Boutot
28e3db2f5f Add a picker for LiveLinkSubjectKey.
#rb simon.therriault

[CL 10945505 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-10 16:21:35 -05:00
Patrick Boutot
e488747140 Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: patrick.boutot
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/... via CL 10898071
#ROBOMERGE-BOT: TOOLS (Dev-Tools-Staging -> Dev-VirtualProduction) (v632-10940481)

[CL 10942172 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-10 11:54:32 -05:00
Patrick Boutot
e20fd10410 SubFrame delay for TC Provider and LiveLink
#rb simon.therriault

[CL 10926102 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-09 09:26:27 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
jeanmichel dignard
2ce7666d2d Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
2020-01-07 15:54:23 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Patrick Boutot
5377c1764a Use FQualifiedFrameTime instead of FTimecode in FApp.
Use a TOptional in FApp, if there is not TCProvider, the frame time will be invalidated. This will change soon in another CL where we will have a "default" TC if no provider is defined but the frame time can be invalid if the TC provider is not "synchronized".
Remove FTimecode for maths in LiveLink and nDisplay, only use timecode for display.
Use FTimecode::IsDropFormatTimecodeSupported for now, to convert from FrameTime to Timecode. That will be changed in another CL when we support NDF and DF properly.
Deprecated AudioCaptureTimecodeProvider.
Generate a default TC value when no TC provided is set. By default it's enabled and the framerate is 24 fps.
Add a CVar that set the engine in DropFrame or NonDropFrame when the TC is 29.97 or 59.94.
Remove the option in sequencer to select between the 2. It's a CVar and not a project settings because other softwares that link with Core need that information.
#rb simon.therriault, andrew.grant

[CL 10730014 by Patrick Boutot in Dev-VirtualProduction branch]
2019-12-16 07:14:17 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Simon Therriault
c48a8501e4 [LiveLink]
- Added support for multiple virtual subject sources
- Added support to create virtual subject sources from UI (not shown for now)
- Added better UI to show missing linked subjects from Animation VirtualSubject
- Added option in Animation virtual subject to append subject name to facilitate usage

#jira UEENT-3210
#rb patrick.boutot

[CL 10310156 by Simon Therriault in Dev-VirtualProduction branch]
2019-11-19 13:50:40 -05:00