Commit Graph

463 Commits

Author SHA1 Message Date
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Tom Hulton-Harrop 108b6f8e0c Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 2021-06-18 12:44:34 +01:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
2021-06-18 11:45:48 +01:00
Hasareej 75e640b908 Hasareej lyn 4389 fix cluster overlap with ImGui (#1329)
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
2021-06-18 09:50:02 +01:00
Tom Hulton-Harrop 8ffd16b0be Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362)
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
2021-06-17 18:31:56 +01:00
IgnacioMartinezGarrido d86e8b63c1 Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB
LYN-1767 : Asset Browser Search View
2021-06-16 17:05:40 +01:00
Tom Hulton-Harrop d9b1ccd323 Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
2021-06-16 12:58:01 +01:00
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 2021-06-16 12:30:10 +01:00
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 2021-06-15 14:12:08 -07:00
srikappa-amzn 9f9c01e781 Used reserve instead of resize 2021-06-15 11:10:45 -07:00
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 2021-06-15 11:07:43 -07:00
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 2021-06-15 10:59:36 -07:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
Hasareej aee7fc72cc Hiding the 2 Clusters during Gameplay mode (#1211)
Hiding the 2 Clusters during Gameplay mode.
2021-06-14 12:53:58 +01:00
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 2021-06-11 17:45:46 -07:00
Danilo Aimini f32590d241 LYN-4042 | No UI Indication that Level is Modified (#1277)
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.

* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
2021-06-11 16:43:53 -07:00
srikappa-amzn e6ec9e48b4 Changed spawnables benchmark test to create multiple spawnables at once 2021-06-11 16:17:26 -07:00
Chris Burel d7ec767ebc Enable -Wnon-pod-varargs (#1278) 2021-06-11 15:43:09 -07:00
Chris Galvan 015f85db20 [LYN-4160] Fixed intermittent crash by changing instantiate prefab dialog to use the AzToolsFramework::GetActiveWindow() helper which always gives a valid active window. 2021-06-11 15:15:45 -05:00
srikappa-amzn 1582cb5257 Enabled instantiate benchmarks 2021-06-11 12:43:35 -07:00
srikappa-amzn 4c6bd5fcb7 Disabled instantiate and spawnable benchmarks 2021-06-11 11:38:49 -07:00
srikappa-amzn 2722ed46c3 Reset prefab system in all prefab benchmarks 2021-06-11 10:03:20 -07:00
Tom Hulton-Harrop 1435982330 Merge pull request #1265 from aws-lumberyard-dev/tomhh_stabilization-to-development
Stabilization/2106 to Development (for 2021/06/11)
2021-06-11 11:20:05 +01:00
Hasareej 0cee5150c7 Hasareej cluster tooltips (#1181)
EditorTransformComponent Cluster Tooltips
2021-06-11 10:07:17 +01:00
sconel 38b1a89631 Merge pull request #1233 from aws-lumberyard-dev/Prefabs/NestedContainerExport
Fix issue involving missing parent container entities in spawnables
2021-06-10 16:28:56 -07:00
Mike Balfour ffe913a2d6 Added ability to convert multiply-nested slices (#1239) (#1245)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.

(cherry picked from commit 86136ddfa6)
2021-06-10 16:16:03 -05:00
sconel 40fa0a3a46 Remove optimization pragma 2021-06-10 13:53:25 -07:00
sconel 9efcc3a6b5 Fix compilation error and failing unit test 2021-06-10 13:15:53 -07:00
Danilo Aimini d3be5600c3 Increase rotation step for Transform (#1244)
Using the spinbox on the Transform Component is made very cumbersome by the low rotation step. Increased it to make it more usable.
2021-06-10 12:30:17 -07:00
sconel 856daf1485 Addressed PR feedback 2021-06-10 10:46:36 -07:00
Mike Balfour 86136ddfa6 Added ability to convert multiply-nested slices (#1239)
* Addressed feedback from previous PR
* Change missing entity aliases to be deterministic.
When converting slices, this helps produce the same results on multiple reconversions of the same data.
* Exposed the asset filter callback.
This allows the slice converter to specifically load nested slices as opposed to not loading *any* referenced assets.
* Added support for multiply-nested slice instance conversion.
2021-06-10 11:53:37 -05:00
Terry Michaels 91fb8be535 Added toolbar icons, updated viewport header UX (#1240) 2021-06-10 11:42:25 -05:00
Aaron Ruiz Mora 7a053d82e1 UX Workflow improvements for Physics Materials (#1237)
- Added button to PhysX Collider Component in PhysX Mesh's field to open FBX Settings.
- Added button Material Selection to open the physics material library in Asset Editor.
- Default Material in PhysX configuration is read only and consistent with the text in combo boxes.
- Material configuration field "Surface Type" renamed to "Name"
- Fixed bug in EditorColliderComponent where the material selection was not updated when changing the library.
- Fixed bug where the materials selection was not set to default when a physics material from the asset was not found in the library.
- Added attributes 'BrowseButtonEnabled' and 'BrowseButtonVisible' to PropertyAssetCtrl.
- Updated physx configuration setreg files of AutomatedTesting project.
2021-06-10 16:36:38 +01:00
igarri 5a53c074c2 Fixing Header Data in AssetBrowserTableModel 2021-06-10 15:14:35 +01:00
Terry Michaels adf6d93a06 Moved toggle pivot to lower in the context menu, converted all context menu additions to use a singular mechanism (#1209) 2021-06-09 22:37:28 -05:00
sconel 2dee4d3ac9 Add support to export nested container entities. Resolves missing parents in spawnables 2021-06-09 17:37:41 -07:00
Terry Michaels aa7bab1027 Make SimpleAssetPropertyHandler handle showing the edit button on component cards (#1221) 2021-06-09 17:47:35 -05:00
srikappa-amzn 20dc47e6d0 Merge pull request #1198 from aws-lumberyard-dev/Prefab/RemoveFileSizeLimits
Remove file size limits when loading prefabs and prefab-based-levels
2021-06-09 10:05:45 -07:00
rhongAMZ 3fd2f1305f Selecting and deleting the level prefab root entity crashes editor (#1179)
Early remove the level instance from the entity id list in the delete function and duplicate function.
2021-06-09 09:15:09 -07:00
igarri be21e585a0 Merge branch 'develop' into LYN-1767-AB 2021-06-09 11:42:31 +01:00
igarri 66bbcb08e5 Fixing Thumbnails preview from TableView 2021-06-09 11:02:09 +01:00
srikappa b23c95cab3 Removed the new added flavor of ReadFile and reused existing one 2021-06-08 17:58:59 -07:00
srikappa 9dec723e33 Remove file size limits when loading prefabs and prefab-based-levels 2021-06-08 17:28:23 -07:00
Danilo Aimini 80f62d0523 LYN-3708 | Optimize Prefab instance propagation to stabilize UX (#700)
* Add instanceToIgnore to calls leading to instances being added to the queue for propagation.

* Change PrefabUndoEntityUpdate to make it so that the instance triggering the prefab template change is not reloaded on propagation, since it will already be up to date due to the way we generated the patch to begin with.

* Add FindPrefabDomValue utility function for paths

* Expose the level root prefab template id in the Prefab EOS Interface

* Fix Instance Alias Path generation to work with the new FindValueInPrefabDom function

* Stop reloading ancestors on propagation, and fix instance reloading so that the level dom is used (and overrides are preserved)

* Remove commented out code, refactor FindPrefabDomValue for paths (was handling an edge case incorrectly, and it's not even triggered)

* Fix issue with PathView reference - with PathView already being a reference, this resulted in a copy and triggered a warning during automated review builds.

* Additional fix to the build warning, remove redundant error message

* Revert changes to Instance::GetAbsoluteInstanceAliasPath(), as they were impacting serialization.

* Remove the dependency to the level root prefab template in the propagation code, climb up the hierarchy instead. This allows tests to work despite not using the EOS properly.
Also use PrefabDomPaths to retrieve the instance dom from the root dom instead of iterating.

* Remove now unused PrefabDomUtils function, extend optimization to link updates.

* Trigger a full instance propagation to correctly refresh alias references.
This is an issue in the test because some operations are called from the backend API and will not trigger propagation properly. Tests will soon be rewritten to more properly represent frontend workflows.

* Fixes lingering issues with propagation:
- Restores code that fixes the selection if entityIds have changed;
- Fixes Do() function on link update. Prefab containers will propagate correctly while still being stable during editing.

* Remove GetRootPrefabInstanceTemplateId (no longer necessary after the code has been rewritten)

* Fix optimization code to account for instances being removed and propagation being run out of order in Create Prefab undo.

* Renamed variable, added comments for clarity.

* Restore asserts on instance not being found; Rename Do to Redo for clarity; Add comments.

* Fixed incomplete comment.
2021-06-08 10:44:20 -07:00
Danilo Aimini 2d1e47793d Move Duplicate menu items and shortcuts out of the Prefab Wip flag
Make duplicate prefab workflows available by default in Prefab mode.
2021-06-08 10:06:25 -07:00
Terry Michaels 0fcd6e84ec Added mechanism for viewpanes to request buttons on the main toolbar (#1189) 2021-06-08 12:02:02 -05:00
Esteban Papp 36cb0f6d40 SPEC-7178 Removal of precompiled cpp files (#1171)
* SPEC-7178  Removal of precompiled cpp files

* Missing files...
2021-06-07 15:59:58 -07:00
Nicholas Van Sickle 9e3d472700 Switch EditorContextMenu back to using popup instead of exec (#1158)
Switch EditorContextMenu back to using popup instead of exec

The switch to exec was a deliberate change, but upon further testing with the latest version of our camera input controllers (both the Legacy and Modern variants) it is no longer necessary to call exec, and doing so can cause a bug in which the cursor is still hidden when the context menu appears.
2021-06-07 09:21:10 -07:00