Commit Graph

33 Commits

Author SHA1 Message Date
michael balzer
fc06d4cab3 BSP Pen Tool: Revert workaround for being able to deal with a default brush without any geometry
#ROBOMERGE-AUTHOR: michael.balzer
#ROBOMERGE-SOURCE: CL 18302733 via CL 18302735 via CL 18302737 via CL 18302853 via CL 18302863
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18302872 by michael balzer in ue5-release-engine-test branch]
2021-11-26 20:34:43 -05:00
michael balzer
bb59dbcb83 BSP Pen Tool: Fix issue with Enter not closing polygon due to default brush not having any geometry
#ROBOMERGE-AUTHOR: michael.balzer
#ROBOMERGE-SOURCE: CL 18278204 via CL 18278393 via CL 18278428 via CL 18279246 via CL 18279277
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18279300 by michael balzer in ue5-release-engine-test branch]
2021-11-23 21:02:10 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
jimmy andrews
580e488045 fix default-enabled ed modes showing up in random order
#rb ryan.schmidt
#rb matt.kuhlenschmidt
#preflight 61535b2d260f7d0001c9cc81

#ushell-cherrypick of 17650582 by Jimmy.Andrews
#preflight 615e2ba87e9a010001258498

#ROBOMERGE-AUTHOR: jimmy.andrews
#ROBOMERGE-SOURCE: CL 17746676 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v879-17706426)

[CL 17746682 by jimmy andrews in ue5-release-engine-test branch]
2021-10-07 03:22:05 -04:00
michael balzer
15052f4eb8 BSP: Fix placement new for FPoly::Vertices using outdated vector type firing check
#rb jimmy.andrews

#ROBOMERGE-AUTHOR: michael.balzer
#ROBOMERGE-SOURCE: CL 17716024 in //UE5/Release-5.0/... via CL 17716033
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v879-17706426)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17716038 by michael balzer in ue5-release-engine-test branch]
2021-10-04 19:05:10 -04:00
johan duparc
161ea060eb #jira UE-122036: fix static analysis GeometryModifiers.cpp dereferencing NULL pointer 'ResultingBrush'
#ROBOMERGE-SOURCE: CL 17356044 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17356060 by johan duparc in ue5-release-engine-test branch]
2021-08-30 14:37:55 -04:00
richard talbotwatkin
d6e126ccac Moved BSP-related functionality into a Developer module, where it can be used by plugins/modules other than UnrealEd.
#jira UETOOL-3833
#rb Matt.Kuhlenschmidt

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

[CL 17174925 by richard talbotwatkin in ue5-release-engine-test branch]
2021-08-16 07:51:37 -04:00
lauren barnes
5bd8c74d4e FAssetEditorModeUILayer now serves as a layer between a given asset editor and the mode toolkits, so that the mode toolkits can request UI panels and the asset editor determines where they are located in the asset editor layout. The first implementation is in the level editor, and all default mode UI has been moved to FModeToolkit.
#jira UETOOL-3555
#preflight 61143dbf9c7bb10001f080b3
#rb Matt.Kuhlenschmidt

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

[CL 17152291 by lauren barnes in ue5-release-engine-test branch]
2021-08-12 10:54:54 -04:00
patrick boutot
8c1e03e9f8 Slate: Convert SButton attributes to SlateAttributes
#rb vincent.gauthier

#ROBOMERGE-SOURCE: CL 16673611 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16673625 by patrick boutot in ue5-release-engine-test branch]
2021-06-15 10:53:29 -04:00
danny couture
69760033c9 Prepare for the deprecation of direct access to the Resource member of UTexture in favor of the GetResource() accessor.
#rb Francis.Hurteau
#preflight 609e56c0423c960001dd9b2c
#rnx

#ROBOMERGE-SOURCE: CL 16328279 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16328292 by danny couture in ue5-release-engine-test branch]
2021-05-14 07:36:08 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
matt kuhlenschmidt
ccd49d7b47 Re-enable brush edit mode
#ROBOMERGE-SOURCE: CL 15729379 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15729404 by matt kuhlenschmidt in ue5-main branch]
2021-03-17 16:13:03 -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
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
brooke hubert
127f266f84 Legacy Mode UI removed.
#rnx
#Jira UE-97668
#rb lauren.barnes
#fyi matt.kuhlenschmidt

[CL 14357487 by brooke hubert in ue5-main branch]
2020-09-21 13:45:49 -04:00
michael daum
7c6d7b3ab2 Drastically reduce the number of targets depending on UnrealWidget.h
#rb lauren.barnes

[CL 14266936 by michael daum in ue5-main branch]
2020-09-07 20:36:09 -04:00
Louise Rasmussen
0909bf3845 Placement Browser Style Updates
#rb matt.kuhlenschmidt

[CL 14249632 by Louise Rasmussen in ue5-main branch]
2020-09-02 19:54:34 -04:00
brooke hubert
b25777d3f1 Move Toolkit Manager to EditorFramework module.
#rnx
#Jira UE-96448
#rb jamie.dale lauren.barnes

[CL 14095882 by brooke hubert in ue5-main branch]
2020-08-12 17:44:00 -04:00
brooke hubert
9fa4bf0f27 Move FEditorModeInfo and shared mode defines to EditorFramework module.
#rnx
#Jira UE-96448
#review-14071452
#rb jamie.dale lauren.barnes

[CL 14084099 by brooke hubert in ue5-main branch]
2020-08-11 16:46:17 -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
jamie dale
db9507f916 Fixed localization conflicts
#jira
#rb none
#rnx

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

[CL 11448075 by jamie dale in 4.25-Plus branch]
2020-02-14 15:48:32 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -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
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
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