Commit Graph

85 Commits

Author SHA1 Message Date
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 2021-04-27 14:12:56 -07:00
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 2021-04-27 14:12:46 -07:00
mnaumov 03e681ca5f Merge from main 2021-04-27 11:26:02 -07:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
AMZN-mnaumov a00d47365e Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -07:00
AMZN-daimini 44f1a627e7 Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
2021-04-26 13:20:35 -07:00
mnaumov c4e3c39ee2 PR feedback 2021-04-26 12:44:51 -07:00
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 2021-04-26 13:25:55 -05:00
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 2021-04-26 11:49:48 -05:00
mnaumov 0bcc85e4d8 scope pointer 2021-04-23 21:55:14 -07:00
mnaumov 30458bc1be PR feedback 2021-04-23 21:40:27 -07:00
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 2021-04-23 20:14:17 -07:00
Guthrie Adams fb26308a26 Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
2021-04-23 17:39:27 -05:00
mnaumov 9f4606c17a Removing test code 2021-04-23 15:01:11 -07:00
mnaumov b215d1c098 Enlarged thumbnails on hover 2021-04-23 14:56:28 -07:00
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
2021-04-23 13:07:20 -05:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 2021-04-22 17:01:29 -07:00
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 2021-04-22 16:56:56 -07:00
daimini 8f79379bc8 Fixes as per Ram's review 2021-04-22 16:45:20 -07:00
daimini 76739de282 Fix spacing 2021-04-22 15:52:39 -07:00
daimini ea43eb3ac9 Set position of instantiated prefab 2021-04-22 15:49:13 -07:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
daimini c9a4b6f50b Better handle the default case for Instantiate 2021-04-22 14:53:07 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 2021-04-22 09:47:18 -07:00
mnaumov 5f0e7f2cbc merge from main 2021-04-21 19:21:02 -07:00
daimini 67fa4a332b Change CreateLink to return the LinkId 2021-04-21 17:43:22 -07:00
daimini ca8d6f8818 Instantiate Prefab 2021-04-21 17:42:33 -07:00
Luis Sempé 8996976efb Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
2021-04-21 17:34:31 -07:00
luissemp 49322b040b Fixed Lua IDE startup 2021-04-21 15:37:15 -07:00
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 2021-04-21 14:54:19 -05:00
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 2021-04-21 13:57:16 -05:00
amzn-sean b0cb5a381b Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
2021-04-21 11:09:32 +01:00
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
2021-04-20 20:05:32 -07:00
AMZN-daimini 62bc7a66bb Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
2021-04-20 16:22:34 -07:00
srikappa-amzn f8c5048b56 Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
2021-04-20 15:42:05 -07:00
srikappa 78892c8d7e Improved a couple of comments 2021-04-20 14:30:56 -07:00
AMZN-mnaumov f4a57663fa Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
AMZN-mnaumov 3994d80c7e Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
[ATOM-15271] Fixing thumbnail pixelation
2021-04-20 11:37:02 -07:00
AMZN-daimini 7901fe8625 Reset the whole Qt model when an entry in the EditorEntityModel is removed. (#48) (#82)
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.

Co-authored-by: Shirang Jia <shiranj@amazon.com>

Co-authored-by: Shirang Jia <shiranj@amazon.com>
2021-04-19 21:52:10 -07:00
mnaumov 7e48bee48f Fixing thumbnail pixelation 2021-04-19 18:24:23 -07:00
srikappa 967d182ccc Fixed a couple of typos 2021-04-19 17:29:03 -07:00
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 2021-04-19 17:26:53 -07:00
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00