Commit Graph

46 Commits

Author SHA1 Message Date
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
matt kuhlenschmidt
e00117cb0c Touch up of landscape mode styling.
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 17570055 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17570080 by matt kuhlenschmidt in ue5-release-engine-test branch]
2021-09-20 09:23:33 -04:00
jonathan bard
a3d07fdb82 Fixed invalid tooltips in landscape
#rb trivial
#jira none
#rnx

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 17491082 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17491095 by jonathan bard in ue5-release-engine-test branch]
2021-09-13 08:43:00 -04:00
Patrick Enfedaque
92b6346f13 Landscape: New Import/Export Tool allows importing/exporting multiple files to support large worlds (WorldPartition)
#rb richard.malo

[CL 14651731 by Patrick Enfedaque in ue5-main branch]
2020-11-04 09:21:48 -04:00
Matt Kuhlenschmidt
a3f6ae9f5e Fix missing tool tips in landscape brushes
#jira UE-97631

[CL 14198831 by Matt Kuhlenschmidt in ue5-main branch]
2020-08-27 08:57:07 -04:00
Louise Rasmussen
2a4d4ea056 Moved Modes Tools into Modes Panel, removed ToolBar
#rb matt.kuhlenschmidt

[CL 13885548 by Louise Rasmussen in ue5-main branch]
2020-07-17 14:42:23 -04:00
patrick enfedaque
98b23b1703 Fix Ensure when going in and out of landscape (and in manage tab)
#rb richard.malo

#ROBOMERGE-SOURCE: CL 13054469 via CL 13054474 via CL 13054476
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13054479 by patrick enfedaque in Main branch]
2020-04-28 08:46:36 -04:00
jonathan bard
0b657e5594 Fixed assert with splines brush tool
#rb patrick.enfedaque
#jira none

#ROBOMERGE-SOURCE: CL 12673560 in //UE4/Release-4.25Plus/... via CL 12673565
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12673574 by jonathan bard in Main branch]
2020-04-08 10:57:06 -04: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
627baf970a Updating copyright for Engine Editor.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -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
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
patrick enfedaque
9a586d9f9e Remove useless if that causes ensure fail. Always declare LOCTEXT.
#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6988279 via CL 6988440
#ROBOMERGE-BOT: (v367-6836689)

[CL 6988457 by patrick enfedaque in Main branch]
2019-06-14 09:26:08 -04:00
patrick enfedaque
d6db12af79 - Landscape Layer System:
New Toggles for Affects Height/Weight
Show Brush Stack always
More brush Undo/Redo fixes
New BP Tool Icons

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6847988 via CL 6848209
#ROBOMERGE-BOT: (v366-6836689)

[CL 6849056 by patrick enfedaque in Main branch]
2019-06-05 11:09:58 -04:00
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
patrick enfedaque
b68c8ff284 - Landscape Layer System: Move setting to enable/disable layers to the LandscapeActor itself
#rb richard.malo
[FYI] michael.dupuis
#rnx


#ROBOMERGE-SOURCE: CL 6594261 via CL 6594357
#ROBOMERGE-BOT: (v351-6581450)

[CL 6594360 by patrick enfedaque in Main branch]
2019-05-21 08:07:49 -04:00
michael dupuis
3b1cd2344b - Change the way the Experimental flag was used, we only rely on the flag to allow enabling/disabling the landscape layers feature
- Enabling/Disabling the layer system is per world settings now
- Changed most of the layer code to either rely on the feature being enabled in the level or be data driven, which is we pass through the layer code path if we have layer content
#rb Patrick.Enfedaque
[FYI] Richard.Malo


#ROBOMERGE-SOURCE: CL 6537091 via CL 6538617

[CL 6538697 by michael dupuis in Main branch]
2019-05-16 16:14:30 -04:00
Chris Gagnon
812b127109 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6525730 by Chris Gagnon in Dev-Editor branch]
2019-05-15 19:27:16 -04:00
patrick enfedaque
33c3522eb3 - Landscape Layer System: Prevent editing of Landscapes in some situations with error banner
Landscape Actor not loaded (in layer mode)
Landscape has layer content but Experimental flag is disabled

#rb richard.malo
#rnx


#ROBOMERGE-SOURCE: CL 6396907 via CL 6397438

[CL 6397448 by patrick enfedaque in Main branch]
2019-05-09 08:54:19 -04:00
patrick enfedaque
a0938f07f8 - Landscape Layer System: New Heightmap Erase Tool (in sculpt mode)
#rb richard.malo
[FYI] michael.dupuis
#rnx


#ROBOMERGE-SOURCE: CL 6339992 via CL 6340091

[CL 6340095 by patrick enfedaque in Main branch]
2019-05-07 07:29:12 -04:00
Chris Gagnon
56e73ed431 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -04:00
richard malo
6f5fce207c - Fixed LandscapeEdMode to automatically set the Target Landscape based on selected spline(s) segment(s) and or control point(s).
[CODEREVIEW] patrick.enfedaque
[FYI] michael.dupuis


#ROBOMERGE-SOURCE: CL 5763041 via CL 5763792

[CL 5763838 by richard malo in Main branch]
2019-04-05 09:55:48 -04:00
Michael Dupuis
1b4f8cbbf5 Changed the name from Landscape Procedural to Landscape Layers
Moved some function from LandscapeEdMode to LandscapeEditLayers

#jira UE-61718
#rb none
[CODEREVIEW] Richard.Malo


#ROBOMERGE-OWNER: Michael.Dupuis
#ROBOMERGE-AUTHOR: michael.dupuis
#ROBOMERGE-SOURCE: CL 5629413 via CL 5631899

[CL 5632451 by Michael Dupuis in Main branch]
2019-03-28 13:48:03 -04:00
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
richard malo
be327ea444 Added basic Procedural Layer management (Create New Layer, Delete Layer, Lock/Unlock Layers, Toggle/Isolate Layer Visibility)
[CODEREVIEW] michael.dupuis
#rb michael.dupuis


#ROBOMERGE-SOURCE: CL 5491687 via CL 5491921

[CL 5491930 by richard malo in Main branch]
2019-03-21 09:05:32 -04:00