Commit Graph

24 Commits

Author SHA1 Message Date
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
andrey yamashev
fc691e4b50 Fixed build warning: Could not find rule set file "MinimumRecommendedRules.ruleset"
#jira UE-91481
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 12561872 in //UE4/Release-4.25/... via CL 12561967 via CL 12562000
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12562086 by andrey yamashev in Main branch]
2020-04-02 14:32:58 -04:00
Andrey Yamashev
e13b12ff82 Temporary warning if a config path has spaces
#jira none
#rb none

[CL 12408005 by Andrey Yamashev in 4.25 branch]
2020-03-25 11:00:10 -04:00
andrey yamashev
294d81be00 Added RenderSync log category to the nDisplayLauncher 'Log' tab
#jira none
#rb none
#lockdown simon.tourangeau

#ROBOMERGE-SOURCE: CL 11558975 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Release-4.25) (v654-11333218)

[CL 11558976 by andrey yamashev in 4.25 branch]
2020-02-19 20:40:49 -05:00
Patrick Boutot
45ea2db77d nDisplay fixes
#jira UE-88089
#rb none
[FYI] Andrey.Yamashev

#ROBOMERGE-OWNER: Andrey.Yamashev
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 11285599 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v647-11244347)

[CL 11286125 by Patrick Boutot in Main branch]
2020-02-06 15:37:17 -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
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
andrey yamashev
31bf8ce9a5 Fixed 32K limit in networking
#jira UEENT-3209
#rb simon.tourangeau
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 10904896 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v626-10872990)

[CL 10904915 by andrey yamashev in Main branch]
2020-01-08 10:55:37 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
Andrey Yamashev
51e438c0bc Unshelved from pending changelist '10646538':
Fixed 32K limit in networking

#jira UEENT-3209
#rb simon.tourangeau

[CL 10774588 by Andrey Yamashev in Dev-VirtualProduction branch]
2019-12-17 15:58:53 -05:00
Simon Tourangeau
0b35766056 Remove Engine version from nDisplayLauncher window title
Can't update that every version to match with engine.

#jira UE-81343
#rb none

[CL 9615018 by Simon Tourangeau in 4.24 branch]
2019-10-16 07:58:36 -04:00
JeanMichel Dignard
d4f0f4d3f2 Copying //UE4/Dev-Enterprise @ cl 9420543 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 9420574 by JeanMichel Dignard in Main branch]
2019-10-04 13:11:45 -04:00
simon tourangeau
25f744dca6 Fix CIS warning
#rb none
#jira none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9230097 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v443-9013191)

[CL 9230181 by simon tourangeau in Main branch]
2019-09-27 15:51:48 -04:00
simon tourangeau
de414c45ef nDisplayLauncher: Fixed issue with spaces in executable path
#jira UE-79992
#author andrey.yamashev
#rb simon.tourangeau
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9219266 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v443-9013191)

[CL 9219293 by simon tourangeau in Main branch]
2019-09-27 13:56:27 -04:00
simon tourangeau
c0363c3595 Misc nDisplay fixes.
#jira UE-76660
#rb none

#ROBOMERGE-SOURCE: CL 7206943 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7206944 by simon tourangeau in Main branch]
2019-06-27 10:02:16 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
jerome delattre
ecff9c8348 Copy from //Tasks/UE4/Partner-vrCluster
nDisplayLauncher - Removed OpenGL3 RHI option from the launcher

#author Andrey.Yamashev
#jira UE-66756
#rb simon.tourangeau

#ROBOMERGE-SOURCE: CL 4947691 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4947693 by jerome delattre in Main branch]
2019-02-08 09:58:43 -05:00
JeanMichel Dignard
fb979d921b Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4784913 by JeanMichel Dignard in Main branch]
2019-01-23 14:28:06 -05:00
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
simon tourangeau
e7bfac75f4 Integrate misc nDisplay fixes from Dev-Enterprise
- nDisplayLauncher: Removed useless no-val command line arguments
- Fixed Editor crash when translation direction is set in BP_DemoWand_Blueprint
- Use quotation marks for paths
- A lot of nDisplay warings "wand not found"
- nDisplayLauncher passes custom arguments at beginning
- Update blueprints (resubmit + comments)
- Single view for monoscipic devices
- Move swap eye attribute to [cluster_node]
- Removed viewport flip feature
- Disable input on slave nodes
- Fix for GL3/4 monoscopic device. Missed changes for 'Viewport positioning fix'.
- Removed custom swap_int
- Fixed demo blueprints
- Fixed crash in DC components when the DC is not initialized
- Fixed visibility of some inherited members
- Fixed Editor crash on second PIE session start
- Fix for viewport positioning
- BP API docs (comments)
- Turn off some screen effects in the nDisplay template project

#jira UE-64170
#rb none

#ROBOMERGE-SOURCE: CL 4409838 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4409839 by simon tourangeau in Staging-4.21 branch]
2018-10-01 07:43:34 -04:00
simon tourangeau
ddc45dedb0 Add missing icons for nDisplay apps, plugin, template
#jira UE-60902
#rb none

#ROBOMERGE-SOURCE: CL 4152238 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)
#ROBOMERGE-AUTHOR: simon.tourangeau

[CL 4152242 by simon tourangeau in Staging-4.20 branch]
2018-06-21 06:37:43 -04:00
jerome delattre
9dcdc6c566 #ROBOMERGE-AUTHOR: jerome.delattre
Copying //Tasks/UE4/Release-4.20-EnterpriseLateFeatures to Release-4.20 (//UE4/Release-4.20)
#rb simon.tourangeau
#jira UE-59798, UE-58919, UE-59480

#ROBOMERGE-SOURCE: CL 4119095 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)

[CL 4119100 by jerome delattre in Staging-4.20 branch]
2018-06-07 18:49:50 -04:00