Commit Graph

21 Commits

Author SHA1 Message Date
sebastian nordgren
d033107bd1 Added missing App.h include causing CIS error in NoPCH Compile configuration.
#jira UE-143346
#rb paul.chipchase
#preflight 6214ad049e2201e21401b11b
#lockdown jeanmichel.dignard

#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 19071590 in //UE5/Release-5.0/... via CL 19090400
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19134383 by sebastian nordgren in ue5-main branch]
2022-02-24 19:48:56 -05:00
sebastian nordgren
5b2687a677 Stylus input is no longer initialized when running commandlets.
Downgraded initialization warning in Stylus Input plugin to Display severity to match other initialization warnings in the plugin.

#jira UE-142827
#rb paul.chipchase
#preflight 620ccaa4615db7478d575b08

#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 19059904 in //UE5/Release-5.0/... via CL 19075009
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19076756 by sebastian nordgren in ue5-main branch]
2022-02-22 13:57:32 -05: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
louise rasmussen
af40e9cac5 Level Editor Menu Clean Up, Part 2
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606d2c11dc3e5b0001c915aa

#ROBOMERGE-OWNER: louise.rasmussen
#ROBOMERGE-AUTHOR: louise.rasmussen
#ROBOMERGE-SOURCE: CL 15937971 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15938452 by louise rasmussen in ue5-main branch]
2021-04-07 02:56:12 -04:00
louise rasmussen
825c64a6f5 Level Editor Menu Re-org, Part 1
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b

#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
danny couture
9ac59bee66 Add meaningful Insights trace affecting either map loading or PIE
#rb Francis.Hurteau

[CL 15777110 by danny couture in ue5-main branch]
2021-03-23 10:58:12 -04:00
sebastian nordgren
04424001ad Stylus plugin no longer registers for the OnWindowClosed event every Tick, but rather only when the window is first encountered, as intended.
Reported in UDN: https://udn.unrealengine.com/s/question/0D52L000053H4lHSAS/stylusinput-plugin-related-mouse-lag-when-below-30-fps

#rb paul.chipchase

[CL 14946878 by sebastian nordgren in ue5-main branch]
2020-12-17 10:59:34 -04:00
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
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
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
marc audy
131659869d Attempt to fix missing include error for non-windows platforms
#rb Sebastian.Nordgren
#jira
#rnx

#ROBOMERGE-SOURCE: CL 12224291 in //UE4/Release-4.25/... via CL 12224294
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224301 by marc audy in Main branch]
2020-03-16 18:20:46 -04:00
sebastian nordgren
4ec61f5b62 Downgraded failure to load RealTimeStylus COM plugin to Display verbosity. Also finding the Common Files folder by using SHGetFolderPath.
#jira UE-90476
#rb paul.chipchase
#rnx

#ROBOMERGE-SOURCE: CL 12200747 in //UE4/Release-4.25/... via CL 12200770
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12200809 by sebastian nordgren in Main branch]
2020-03-16 10:43:58 -04:00
sebastian nordgren
668417b5e6 Added error condition checks in the stylus plugin to silence static analysis.
#jira none
#rb paul.chipchase

#ROBOMERGE-SOURCE: CL 12058343 in //UE4/Release-4.25/... via CL 12058346
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076369 by sebastian nordgren in Main branch]
2020-03-09 13:21:47 -04:00
sebastian nordgren
9a66fc08ad Downgrading stylus loading failure log to warning, because it was causing nightly builds to fail on CIS machines.
#jira none
#rb paul.chipchase

#ROBOMERGE-SOURCE: CL 12058182 in //UE4/Release-4.25/... via CL 12058183
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076355 by sebastian nordgren in Main branch]
2020-03-09 13:21:44 -04:00
sebastian nordgren
6224f60a17 Stylus input plugin usage of Windows Ink API has been changed to prevent an occasional deadlock that occurred when moving a mouse or stylus between open windows in the editor.
Previously, we created a single IRealTimeStylusSyncPlugin per IRealTimeStylus instance and attempted to switch the HWND that it was listening to, but this caused a deadlock when switching the HWND. Now we instead create an IRealTimeStylus and SyncPlugin per HWND and remove it when the window is closed. This removes the need for thread synchronization, and thus the deadlocks that could result.

There is an IRealTimeStylusSynchronization interface available, but my experiments with it did not resolve the issue and the documentation doesn't clarify its usage.

#jira UE-89401
#rb chris.gagnon

#ROBOMERGE-SOURCE: CL 12000316 in //UE4/Release-4.25/... via CL 12000797
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 12001001 by sebastian nordgren in Main branch]
2020-03-06 12:23:33 -05:00
jamie dale
16fade58e3 Downgraded some stylus init errors to warnings
#jira UE-90042
[FYI] Sebastian.Nordgren
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11938389 in //UE4/Release-4.25/... via CL 11938390
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11938497 by jamie dale in Main branch]
2020-03-05 12:14:21 -05:00
jamie dale
3cb92761d6 COMPtr doesn't have explicit operator bool
#jira UE-90042
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11897888 in //UE4/Release-4.25/... via CL 11897895
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11897913 by jamie dale in Main branch]
2020-03-04 12:12:45 -05:00
jamie dale
8d07bd4255 Fix null pointer access if the Stylus system fails to initialize
#jira UE-90042
[FYI] Sebastian.Nordgren
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11897763 in //UE4/Release-4.25/... via CL 11897780
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11897788 by jamie dale in Main branch]
2020-03-04 12:09:54 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24.
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
2019-09-10 11:35:20 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00