Commit Graph

27 Commits

Author SHA1 Message Date
Dmitriy Dyomin
70dff16c2c Fixed: Heightmaps import flipped on X axis in World Composition Browser
UE-17598

[CL 2601841 by Dmitriy Dyomin in Main branch]
2015-06-26 02:43:24 -04:00
Gil Gribb
35cf42566a UE4 - merge GDC branch, code @2465640 to main
[CL 2468685 by Gil Gribb in Main branch]
2015-03-04 08:31:40 -05:00
Dmitriy Dyomin
1c3dc780a7 Added command to 'Levels browser' to move selected foliage instances to specific sub-level
UE-9430

[CL 2466066 by Dmitriy Dyomin in Main branch]
2015-03-02 03:39:59 -05:00
Dmitriy Dyomin
79cd15b908 World composition: Show both - observer and player markers in minimap
[CL 2392146 by Dmitriy Dyomin in Main branch]
2014-12-18 00:07:04 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Gil Gribb
89ad70df9d Merging development branch (CL 2365488) to //depot/UE4/... Engine only, mostly hierarchical foliage
[CL 2376199 by Gil Gribb in Main branch]
2014-12-04 12:41:25 -05:00
Jack Porter
6b25ea0190 Merging back to main from GDC2015 branch.
-Prevent landscape collision from checking the DDC when we know we are generating new collision data for the first time.
-Do not recreate landscape collision objects when actor is moved
-Added error messages on tiled landscape import dilaog to explain what is wrong with source data
-Added png format support when importing tiled weighmaps
-Show material instances in tiled landscape import dialog

[CL 2371382 by Jack Porter in Main branch]
2014-11-27 03:51:23 -05:00
Dmitriy Dyomin
907392cdd4 Fixed world composition view regression
[CL 2251090 by Dmitriy Dyomin in Main branch]
2014-08-11 03:33:39 -04:00
Dmitriy Dyomin
155ec0e778 Changed world origin to a 3d location instead of 2d. Exposed Get/Set OriginLocation functions to blueprints.
[CL 2246744 by Dmitriy Dyomin in Main branch]
2014-08-07 05:00:43 -04:00
Dmitriy Dyomin
a5b6783ce2 Viewport actor menu command "Add/Remove level selection" works correcly with both old levels browser and a new one.
[CL 2229625 by Dmitriy Dyomin in Main branch]
2014-07-24 04:33:54 -04:00
Bob Tellez
cef4d646f7 [AUTOMERGE]
#UE4 Added support to drag and drop world assets on the level browser (specifically the level list in SWorldHierarchy) to add them as sublevels.

#codereview Dmitriy.Dyomin

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2222841 by Bob.Tellez on 2014/07/17 18:26:40.

[CL 2227532 by Bob Tellez in Main branch]
2014-07-22 16:48:56 -04:00
Dmitriy Dyomin
c431419008 Fixed: A new blank map doesnÆt have a Persistent Level
TTP# 341247

[CL 2215758 by Dmitriy Dyomin in Main branch]
2014-07-14 23:07:15 -04:00
Dmitriy Dyomin
788653a3fd World Browser: Changed context menus to be more consistent between different views
[CL 2180113 by Dmitriy Dyomin in Main branch]
2014-07-09 06:11:08 -04:00
Dmitriy Dyomin
3925956d7b Moved "Remove Selected", "Change Streaming Method" comands to a "Levels" section of context menu
TTP# 340491

[CL 2136132 by Dmitriy Dyomin in Main branch]
2014-07-04 04:51:57 -04:00
Dmitriy Dyomin
237774673c World Browser: Added rotation to a simulation view position indicator. Changed world bounds color from red to yellow
[CL 2114923 by Dmitriy Dyomin in Main branch]
2014-06-24 02:28:53 -04:00
Barnabas McManners
2e1ef42680 Level and world browsers Move Selected Actor To Level command is only enabled if the the selected actors arenÆt in the selected level.
#TTP 335685 - EDITOR: Level Browser: Allowed to click "move selected actor to level" on an actor that is already in the selected level

#branch UE4

#proj Editor.WorldBrowser
#proj Editor.Levels

#change Added a new method IsValidMoveActorsToLevel to both FLevelCollectionModel and FLevelCollectionViewModel, this is used to enable the Move Actor to level command for both cases. It scans the selected actors and checks their levels against the selected levels. If any actor is contained within any of the selected levels it disables the control. It also disables the control should there be no actors selected. If both of these cases pass it simply checks if the level is editable.

#reviewedby Chris.Wood

[CL 2113869 by Barnabas McManners in Main branch]
2014-06-23 06:42:01 -04:00
Dmitriy Dyomin
d268228263 World Browser: Fixed case when user was able to move selected actors to a hidden level, which was causing unexpected results
[CL 2104406 by Dmitriy Dyomin in Main branch]
2014-06-13 06:28:41 -04:00
Jaroslaw Palczynski
ebce413232 UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final.
[CL 2104397 by Jaroslaw Palczynski in Main branch]
2014-06-13 06:14:46 -04:00
Dmitriy Dyomin
d155054ae1 Tiled landscape import improvements
Added option for weight-blended layers
Added ability to import only part of weightmaps

[CL 2075350 by Dmitriy Dyomin in Main branch]
2014-05-16 06:51:45 -04:00
Dmitriy Dyomin
c6d6f9446d World Browser UX improvements
Splitted World Browser views into three independent windows, each window can be summoned from a hierarchy view or details view toolbar
World composition can now be toggled through WorldSettings - bEnableWorldComposition. Once enabled persistent level will be treated as a world root. No more '?worldcompistion' parameter workarounds. 'Open World' command was removed, as levels saved with world composition enabled can be open through 'Open Level' command.
Added bEnableWorldOriginRebasing parameter to WorldSettings, which contols whether world origin shifting should be used

[CL 2072584 by Dmitriy Dyomin in Main branch]
2014-05-14 02:16:14 -04:00
Dmitriy Dyomin
fe85d69b84 Disabled "Merge..." command when persistent level is selected in World Browser
[CL 2055333 by Dmitriy Dyomin in Main branch]
2014-04-24 07:23:57 -04:00
Dmitriy Dyomin
3082ee4f8b World Browser: - Fixed unnecessary GC reference handling
[CL 2053107 by Dmitriy Dyomin in Main branch]
2014-04-23 20:03:14 -04:00
Dmitriy Dyomin
e5292522de World Browser:
- Added material selection to tiled landscape importing tool
- Added tiled weightmap import option for each landscape layer found in selected material

[CL 2052201 by Dmitriy Dyomin in Main branch]
2014-04-23 19:55:01 -04:00
Dmitriy Dyomin
4cfb710f74 World Browser:
- Added icons to level hierarchy to distinguish level streaming methods
- Added tile coordinates offset when umporting tiled heightmap

[CL 2047641 by Dmitriy Dyomin in Main branch]
2014-04-23 19:08:32 -04:00
Dmitriy Dyomin
3b5203dcf8 World Browser: - Added tiled landscape importing
[CL 2041453 by Dmitriy Dyomin in Main branch]
2014-04-23 17:51:01 -04:00