Commit Graph

82 Commits

Author SHA1 Message Date
robert manuszewski
f8a812a32f Converting hardcoded short class/enum names to pathnames ahead of ANY_PACKAGE removal
#rb trivial
#jira UE-99463
#preflight 6288fd998828ea88c8aef3d0

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 20314896 via CL 20314897 via CL 20314903 via CL 20314904
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20315214 by robert manuszewski in ue5-main branch]
2022-05-22 10:30:02 -04:00
simon therriault
534e4759c8 - Rollback LiveLink MessageBus version to support new backward compabitility with older UE
#rb geoffrey.douglas
#jira UE-142171
#preflight 620551fba155a4cddac2ac71
#lockdown alejandro.arango

#ROBOMERGE-AUTHOR: simon.therriault
#ROBOMERGE-SOURCE: CL 18942711 in //UE5/Release-5.0/... via CL 18942890 via CL 18943150
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18943158 by simon therriault in ue5-main branch]
2022-02-10 16:30:20 -05:00
geoffrey douglas
074bf68b43 Add another offset to the livelink source settings to achieve smooth evaluation with EngineTime
#UE-139207
#rb simon.therriault
#preflight 61f46b10241aeec8656320df

#ROBOMERGE-AUTHOR: geoffrey.douglas
#ROBOMERGE-SOURCE: CL 18780098 in //UE5/Release-5.0/... via CL 18780850 via CL 18781348
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18781651 by geoffrey douglas in ue5-main branch]
2022-01-28 19:48:31 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
simon therriault
7d8ac77282 - Bumping livelink version for ue5 and fixing advertised version in LL message bus
#rb jeremie.roy, geoffrey.douglas
#preflight 6141020d568b3a0001b685cc

#ROBOMERGE-AUTHOR: simon.therriault
#ROBOMERGE-SOURCE: CL 17510145 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17510194 by simon therriault in ue5-release-engine-test branch]
2021-09-14 17:10:55 -04:00
jeremie roy
e9ca441443 Fix ApplyPreset assuming RemoveAllSources is done in one tick
#rb simon.therriault
#jira UE-120939

#ROBOMERGE-SOURCE: CL 17214969 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17214975 by jeremie roy in ue5-release-engine-test branch]
2021-08-18 10:49:40 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
aurel cordonnier
25a11deeac Merge from Release-Engine-Staging @ 16579919
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-07 20:09:45 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
simon therriault
f3dd0c8a9d - Fix for livelink virtual subjects api potentially crashing when used multi threaded
#rb alejandro.arango
#jira

#ROBOMERGE-SOURCE: CL 16365681 in //UE4/Release-4.27/... via CL 16365690
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16373118 by simon therriault in ue5-release-engine-staging branch]
2021-05-18 14:50:19 -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