Commit Graph

170 Commits

Author SHA1 Message Date
igarri 80684b383b Code cleanup 2021-05-12 11:42:39 +01:00
igarri 1c990b2ef6 Filter Sorting Working 2021-05-12 11:03:02 +01:00
igarri 6e15e87e41 Asset Browser Table view filtering 2021-05-10 15:52:35 +01:00
igarri 662951eb98 Merge branch 'main' into LYN-1767-AB 2021-05-10 10:41:54 +01:00
igarri 65550d3f1c Entries updating on the table view 2021-05-10 10:39:01 +01:00
Danilo Aimini 656a8443bc Merge pull request #382 from aws-lumberyard-dev/Prefab/Instantiate/Loop
LYN-3245 | Detect circular dependencies on Instantiate Prefab and cancel operation
2021-05-07 18:43:01 -07:00
daimini e24827efb3 Fix direct editing of a reference 2021-05-07 17:08:35 -07:00
daimini 4662290d92 Switching IsPrefabInInstanceAncestorHierarchy to use const refs 2021-05-07 16:50:41 -07:00
daimini 47001dc0c3 Merge main 2021-05-07 16:42:51 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00
greerdv 3817c05d81 fixing unit test 2021-05-07 19:54:59 +01:00
Tom Hulton-Harrop c5a06b8953 Restore grid and angle snapping (#640)
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
greerdv 4202f646e4 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 15:20:29 +01:00
greerdv 9e22268107 feedback from PR 2021-05-07 15:18:51 +01:00
greerdv 2c6d04f673 feedback from PR 2021-05-07 15:03:57 +01:00
AMZN-mnaumov 5fb923738e Merge pull request #614 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15474
[ATOM-15474] Material Editor camera controller zoom respects viewport boundary
2021-05-06 17:45:47 -07:00
greerdv ad6479967f changing add NUS button from invisible to read only when NUS component already present 2021-05-06 22:15:00 +01:00
mnaumov dfd0cbb0fd Material Editor camera controller zoom respects viewport boundary 2021-05-06 13:10:55 -07:00
chiyenteng ede1889507 [CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#585)
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490)
2021-05-06 10:39:43 -07:00
rgba16f 7b95b5e329 Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
2021-05-05 10:34:17 -05:00
greerdv 45cbe4767f adding comment to AddNonUniformScaleButton 2021-05-05 15:14:50 +01:00
greerdv a49017ec23 merging from main 2021-05-05 13:26:08 +01:00
greerdv e1f7d04bc2 adding icon for non-uniform scale component 2021-05-05 13:10:01 +01:00
Tom Hulton-Harrop cec56d7b27 Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4
Camera Updates - Part 4
2021-05-05 09:46:56 +01:00
greerdv cd93df4ca8 hiding button to add non-uniform scale when there already is a NUS component on the entity 2021-05-04 23:15:51 +01:00
srikappa-amzn a5ccfa6053 Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix undo for nested prefab creation by providing link patches to the undo node
2021-05-04 13:20:37 -07:00
rgba16f 1c1a9aeab4 Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID 2021-05-04 14:40:31 -05:00
rgba16f 593528532f Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId 2021-05-04 14:36:48 -05:00
greerdv 5e94c9c838 fixing highlighting behaviour when trying to drag components above non-uniform scale component 2021-05-04 18:59:04 +01:00
jackalbe 8b1251c9f7 {LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function (#392)
* {LYN-2185} Helios - Added GraphObjectProxy::GetMethodList() function

* Updated the EditorPythonConsoleInterface to get Python type name info
* Added PythonBehaviorInfo to the GraphObjectProxy object to reflect abstract calls that can be invoked
* removed SCENE_DATA_API from Reflect() function

Jira: https://jira.agscollab.com/browse/LYN-2185
Tests: Added tests GraphObjectProxy_GetClassInfo_Loads & GraphObjectProxy_GetClassInfo_CorrectFormats to regress test

* fix compile error

* etchPythonTypeName() returns AZStd::string

* put None into a const char
2021-05-04 12:55:47 -05:00
greerdv d9b3b7ccfa adding non-uniform scale component via button on transform component and forcing it to be adjacent in the component sort order and visible 2021-05-04 18:31:43 +01:00
hultonha a206896074 remove QPoint from lower-level interfaces, switch to use AzFramework::ScreenPoint 2021-05-04 17:32:47 +01:00
lumberyard-employee-dm bcbe1bfef7 LYN-2537 AssetBundler updates (#426)
* LYN-2537 Updated the AssetBundler code to looks for the AssetSeedList
files within the Assets/Engine directory
Updated the MissingDependencyScanner GetXMLDependenciesFile functions to
use the Assets/Engine directory as well

Also fixed the MissingDependencyScanner to properly located dependency
xml files within gem directories

* Adding back input argument validation for the AssetBundler command options.

Also added an application_options settings registry file that contains the list of valid command options for the ComponentApplication

* Adding missing end of file newline for applications_options.setreg

* Fixed the AssetBundler help output for the bundleSeed command
2021-05-03 20:09:37 -05:00
srikappa a7624bb985 Removed returning AZ::Failure when AZ::Assert is thrown 2021-05-03 17:23:00 -07:00
Chris Galvan 8b0b3f4d02 [LYN-3078] Removed legacy CMaterial and all related/unused classes. 2021-05-03 16:42:11 -05:00
AMZN-koppersr 5eeeaf4346 Fixed several release build compile errors. 2021-05-01 13:26:54 -07:00
AMZN-mnaumov bdd276d209 Merge pull request #467 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15426
[ATOM-15426] Fixing missing asset crashing Editor
2021-04-30 16:03:33 -07:00
mnaumov e7600cef94 PR feedback 2021-04-30 14:24:34 -07:00
mnaumov 01bba93f28 PR feedback 2021-04-30 12:52:03 -07:00
greerdv c8e8c1de66 Merge branch 'main' into non-uniform-scale-ux 2021-04-30 16:37:22 +01:00
Chris Galvan 6ace9ffedb [LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled. 2021-04-30 10:24:01 -05:00
greerdv cee4ca8067 WIP adding button to transform component to add non-uniform scale component 2021-04-30 12:37:12 +01:00
mnaumov ce367b4383 Fixing missing asset crashing Editor 2021-04-29 21:57:34 -07:00
daimini bc3f285601 Refactored IsPrefabInInstanceAncestorHierarchy to use Instance Optional References. Added more information to the error message. 2021-04-29 18:45:42 -07:00
srikappa 18c352cdb1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-29 17:05:17 -07:00
daimini 7f971f726d Merge branch 'main' into Prefab/Instantiate/Loop 2021-04-29 17:05:17 -07:00
srikappa d433cd623b Fix undo for nested prefab creation by providing link patches to the undo node 2021-04-29 17:02:44 -07:00
Chris Galvan 217ba1e816 [LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled. 2021-04-29 16:45:39 -05:00
Nicholas Van Sickle 3c5c692148 Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
2021-04-29 11:19:28 -07:00
Eric Phister fbdd26bbbc Merge pull request #410 from aws-lumberyard-dev/ly-sdk/phistere/LYN-2723-Merge
LYN-2723: Fixes issues with bad project or engine paths

Cherry-pick: 6ce7a6d30c57c941459b43c157861df5d9143ae1
2021-04-29 11:01:32 -05:00