Commit Graph

74 Commits

Author SHA1 Message Date
Ben Marsh
a414e0be0c [INTEGRATE] 4.4 branch back to main.
[CL 2251491 by Ben Marsh in Main branch]
2014-08-11 11:51:02 -04:00
Jack Porter
0e0e8c8af3 Fix crash due to the the heightmap texture being locked twice when adding components with XY offset.
TTP#343040

[CL 2245619 by Jack Porter in Main branch]
2014-08-06 11:26:29 -04:00
Sangwoo Lee
a746b2ab21 Landscape : Fixed Add Component regression (no interpolation height, TTP #343057)
#code_review jack.porter

[CL 2245307 by Sangwoo Lee in Main branch]
2014-08-06 03:54:25 -04:00
Mikolaj Sieluzycki
b2a114be70 Header cleanup: Engine module, Landscape headers.
[CL 2242422 by Mikolaj Sieluzycki in Main branch]
2014-08-04 10:14:05 -04:00
Sangwoo Lee
e30cc5a13a Landscape Tool : Fixed ensure for nav mesh for Add component tool (TTP #341789)
[CL 2239586 by Sangwoo Lee in Main branch]
2014-08-01 04:21:11 -04:00
Michael Trepka
3293117f09 More fixes for Clang warnings
[CL 2238624 by Michael Trepka in Main branch]
2014-07-31 15:43:08 -04:00
Michael Trepka
62e7793fa0 Another batch of fixes for Clang compile warnings
[CL 2237490 by Michael Trepka in Main branch]
2014-07-30 16:16:46 -04:00
Michael Trepka
5bd6255fde More Clang compile warning fixes
[CL 2237347 by Michael Trepka in Main branch]
2014-07-30 14:51:27 -04:00
Nick Atamas
badf62c330 Slate slots now use a common base class, which has a private '.Widget' member; use GetWidget() instead.
Slate TPanelChildren, TSlotlessChildren are no longer full-fledged arrays; removed any unused Array API.
Fixed up a lot of improper use cases.

This better encapsulates the action of adding/removing Slate Widgets from the runtime tree as a Slate Core concern.
Alows us to add parent pointers in the future with significantly less effort.

#codereview Wes.Hunt
#codereview Nick.Darnell
#codereview Matt.Kuhlendschmidt
#codereview Justin.Sargent

[CL 2234301 by Nick Atamas in Main branch]
2014-07-28 06:53:40 -04:00
Gareth Martin
d336fb6409 Fix crash when trying to use the landscape painting tools with no paintable layers
[CL 2234237 by Gareth Martin in Main branch]
2014-07-28 05:08:15 -04:00
Richard TalbotWatkin
7e9b8173a4 Fixed issue where returning to landscape mode after creating a landscape causes a crash.
#ttp 341779 - CRITICAL: Regression: EDITOR: CRASH: Switching back to Landscape edit more
#branch UE4
#proj Editor.LandscapeEditor
In FEdModeLandscape::Enter, initializes the current tool prior to creating the landscape toolkit, as the toolkit has a dependency on the current tool being valid.
#reviewedby Gareth.Martin, Chris.Wood

[CL 2231313 by Richard TalbotWatkin in Main branch]
2014-07-25 03:19:01 -04:00
Sangwoo Lee
7bcfc29da3 Landscape : Fixed TTP #342158 : Fixed retopoligization tool problem
[CL 2231020 by Sangwoo Lee in Main branch]
2014-07-24 22:27:11 -04:00
Robert Manuszewski
f0a48eb095 Helper functions for TMaps and TSets in FReferenceCollector
[CL 2228355 by Robert Manuszewski in Main branch]
2014-07-23 08:26:24 -04:00
Mark Satterthwaite
379f874d03 Make Clang happy when compiling FLandscapeXYOffsetCache by fully qualifying the template super-type. Also rearranged the constructor order to be 'correct'.
#codereview michael.trepka

[CL 2228330 by Mark Satterthwaite in Main branch]
2014-07-23 08:25:25 -04:00
Gareth Martin
88b1adac4f Add manual rotation option to landscape editor alpha brush
Fix bug in alpha brush that could read off the +X/+Y edges of the supplied texture

[CL 2228303 by Gareth Martin in Main branch]
2014-07-23 08:25:02 -04:00
Sangwoo Lee
5688a09997 Landscape : Fixed TTP #332780 : Fixed problem when you add component near component with XYOffset
[CL 2228241 by Sangwoo Lee in Main branch]
2014-07-23 08:24:09 -04:00
Nick Atamas
978a62ee0f Slate Hittesting 2.0 : Hittesting no longer bound to logical widget hierarchy.
Merged from usr/Nick.Atamas/UE4_SlateDev => /UE4

[CL 2228155 by Nick Atamas in Main branch]
2014-07-23 08:23:21 -04:00
Michael Trepka
2afcfde612 Added FLandscapeTool constructor to initialize its PreviousBrushIndex
[CL 2225889 by Michael Trepka in Main branch]
2014-07-21 16:10:56 -04:00
Dmitry Rekman
90a433a583 Fixing CIS (template instatiation errors).
#codereview Gareth.Martin, Steve.Robb

[CL 2222728 by Dmitry Rekman in Main branch]
2014-07-17 17:20:30 -04:00
Gareth Martin
e20a958f1d Remove FLandscapeToolSet
Rename ALandscapeProxy::DataLayer to VisibilityLayer
Fix visibility tool not showing the visibility layer as its target

[CL 2222321 by Gareth Martin in Main branch]
2014-07-17 12:20:34 -04:00
Jack Porter
18220e1a6a Missing include file breaking non-unity.
[CL 2222317 by Jack Porter in Main branch]
2014-07-17 12:15:31 -04:00
Sangwoo Lee
e88666e487 Landscape : Fixed for deleting/adding component problem, where deleted component or neighbors have LODBias/ForcedLOD case
[CL 2222027 by Sangwoo Lee in Main branch]
2014-07-17 07:49:03 -04:00
Bob Tellez
a399d885b6 Merging CL#2188206 using UE4-Fortnite-To-UE4
MCPInfo:
  "app" : "fortnite",
  "moduleName" : "Fortnite-PublicService",
  "branch" : "TRUNK",
  "build" : "240",
  "cln" : "2172251",
  "version" : "UNKNOWN"

[CL 2215307 by Bob Tellez in Main branch]
2014-07-14 19:41:38 -04:00
Jack Porter
19c3d6751a Change landscape texture/mic outer back to package to fix slow PIE with LandscapeMountains
TTP#341135

[CL 2197805 by Jack Porter in Main branch]
2014-07-12 12:59:16 -04:00
Dmitry Rekman
dbdea559eb [Github] PR 242 (safe changes).
- Code cleanup and minor rearrangement (e.g. variable name changes).
- Additions.
- Case issues fixed.
- Minor fixes (init ordering).

[CL 2172690 by Dmitry Rekman in Main branch]
2014-07-08 00:06:17 -04:00