Commit Graph

38 Commits

Author SHA1 Message Date
vitalii boiko
59c21d9760 ndisplay: fixed cis build error
#jira none
#rb Alejandro.Arango
#lockdown Alejandro.Arango
#preflight 62174ab31a114ad50430ad74

#ROBOMERGE-AUTHOR: vitalii.boiko
#ROBOMERGE-SOURCE: CL 19111217 in //UE5/Release-5.0/... via CL 19111259
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19152759 by vitalii boiko in ue5-main branch]
2022-02-25 14:12:53 -05:00
vitalii boiko
a7522dcb00 nDisplay: fixed freeze preview, fixed preview node UI, fixed readonly ini treatment
#jira UE-143625, UE-143628, UE-143633
#rb Alejandro.Arango, Peter.Tarasenko
#lockdown Alejandro.Arango
#preflight 6216c521476ef5d8a211d51b


#ROBOMERGE-AUTHOR: vitalii.boiko
#ROBOMERGE-SOURCE: CL 19106401 via CL 19106542 via CL 19106551 via CL 19106617 via CL 19110166
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19151506 by vitalii boiko in ue5-main branch]
2022-02-25 13:24:58 -05:00
andrey yamashev
04765f1224 nDisplay: fixed PIE crash if no p-node set
#jira UE-137886
#rb Alejandro.Arango
#preflight 61e7abfaf517d721f98ec51e

#ROBOMERGE-AUTHOR: andrey.yamashev
#ROBOMERGE-SOURCE: CL 18655601 in //UE5/Release-5.0/... via CL 18655606 via CL 18655613
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v900-18638592)

[CL 18655619 by andrey yamashev in ue5-main branch]
2022-01-19 02:06:10 -05:00
andrey yamashev
e96a2275ba nDisplay: various updates
- got rid of master/slave terminology
- new JSON 500 config scheme
- removed old CFG config scheme

#jira UE-133179
#rb Alejandro.Arango, Patrick.Hardy
#preflight 61bbb2ae372f4dbf43856a61

#ROBOMERGE-AUTHOR: andrey.yamashev
#ROBOMERGE-SOURCE: CL 18489261 in //UE5/Release-5.0/... via CL 18489267
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18489272 by andrey yamashev in ue5-release-engine-test branch]
2021-12-20 15:33:45 -05:00
andrey yamashev
1c777aafd4 nDisplay: fixed path for *Engine.ini to use
#jira UE-132071
#rb Alejandro.Arango

#ROBOMERGE-AUTHOR: andrey.yamashev
#ROBOMERGE-SOURCE: CL 18264219 in //UE5/Release-5.0/... via CL 18264233
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18264252 by andrey yamashev in ue5-release-engine-test branch]
2021-11-22 17:48:06 -05:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -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
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
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
2021-05-11 01:10:20 -04:00
will damon
45c87c95f2 Check for object system existence before unregistering customizations.
- This fixes a collection of ASAN reported issues of memory-use-after-free.

#rb brandon.schaefer, francis.hurteau
#jira none
#rnx

[CL 16252564 by will damon in ue5-main branch]
2021-05-10 15:07:12 -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
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
brooke hubert
48113fc77e Adding EditorFramework to build.cs files
#rnx
#Jira UE-96448
#rb chris.gagnon

[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
andrey yamashev
f2e55d8742 Fixed crash for LoadLevel in PIE
#jira none
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 12599018 in //UE4/Release-4.25/... via CL 12599021 via CL 12599027
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12599029 by andrey yamashev in Main branch]
2020-04-03 17:40:12 -04:00
Andrey Yamashev
683a06a8db Fixed issue when "Stop PIE" button is not available after an error during nDisplay initialization
#jira UE-91041
#rb none

[CL 12394091 by Andrey Yamashev in 4.25 branch]
2020-03-24 17:46:18 -04:00
Andrey Yamashev
898fc1cbec Fixed issue where DisplayClusterRootActor could not be found if it's located in a sublevel
#jira none
#rb none

[CL 11458677 by Andrey Yamashev in 4.25 branch]
2020-02-17 03:00:22 -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
Andrey Yamashev
838c473ece Stability update: added some nullptr checks
#jira UE-86674
#rb none

[CL 11026160 by Andrey Yamashev in Dev-VirtualProduction branch]
2020-01-16 01:47:14 -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
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
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
Chris Gagnon
346a4b05ea Copy up from Dev-Editor @10681378
#rb none

[CL 10837446 by Chris Gagnon in Dev-Tools-Staging branch]
2019-12-19 18:07:47 -05:00