Commit Graph

77 Commits

Author SHA1 Message Date
Simon Therriault
836e8e4895 - Bumping livelink version for ue5 and fixing advertised version in LL message bus
#rb jeremie.roy, geoffrey.douglas
#preflight 6141020d568b3a0001b685cc

[CL 17510145 by Simon Therriault in ue5-main branch]
2021-09-14 17:07:20 -04:00
jeremie roy
a292774d86 Fix ApplyPreset assuming RemoveAllSources is done in one tick
#rb simon.therriault
#jira UE-120939

[CL 17214969 by jeremie roy in ue5-main branch]
2021-08-18 10:49:10 -04:00
aurel cordonnier
d17d20ca36 Merge from Release-Engine-Test @ 16758890 to UE5/Main
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Simon Therriault
b33610eec6 - Removing UE4 references from some VP modules
#jira UE-111179
#rb jeremie.roy

[CL 15777559 by Simon Therriault in ue5-main branch]
2021-03-23 11:36:15 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Zousar Shaker
3b4c8fc1c5 Automated wrapped object pointer upgrade for Engine + ShooterGame + ShooterGame referenced plugins
#rb none

[CL 15224650 by Zousar Shaker in ue5-main branch]
2021-01-27 17:40:25 -04:00
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