birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,056 Commits 3 Branches 3 Tags
8d35f31fa64102d7694fcb1bd10a7d0f82d13fff
Commit Graph

483 Commits

Author SHA1 Message Date
alexmontAmazon 69f2e06134 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-06-29 17:31:27 -07:00
IgnacioMartinezGarrido b87e3eb1d6 LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. (#1616) 
* Fixed: Item returning null in drag and drop when column is hidden

* Added explanation about why this approach is needed

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:51 +01:00
John fd1bb483c0 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:38 +01:00
John 478ffeeac6 Remove PythonCoverage runtime component 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:35 +01:00
John 0e0f266fdd Provisional implementation of PythonCoverage gem 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:33 +01:00
Yuriy Toporovskyy 41a5a5b4f4 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:26 +01:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
 2021-06-22 12:55:18 -05:00
Danilo Aimini a0f4f16b98 Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 2021-06-21 15:47:25 -07:00
Nicholas Van Sickle b032177418 Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18 
Merge stabilization/2106 into development
 2021-06-21 10:58:07 -07:00
sconel e357dea06c Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix 
Spawnable/game mode load error fix
 2021-06-21 09:57:44 -07:00
greerdv 0e5ec11cdc Merge pull request #1455 from aws-lumberyard-dev/non-uniform-scale-hydra 
exposing non-uniform scale component id as a behavior constant for hydra
 2021-06-21 17:21:17 +01:00
amzn-sean 9f934a6f63 add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 2021-06-21 16:25:45 +01:00
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 2021-06-21 11:12:50 +01:00
IgnacioMartinezGarrido e4e22879b8 LYN-1767: Search View Crash Fix (#1430) 
* Fixed crash in tableView when the filter goes empty and there is a selected entry.

* fixed consts

* Code Review Changes

* more minor fixes
 2021-06-21 10:49:01 +02:00
sconel bb0c60d1d4 Correctly add generated spawnables to asset manager in game mode 2021-06-18 16:43:14 -07:00
srikappa-amzn 8f3c227842 Merge pull request #1438 from aws-lumberyard-dev/Prefab/DetachPrefabBugFixes 
Fix bug with DetachPrefab incorrectly replacing old entity aliases in patches
 2021-06-18 13:34:01 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Danilo Aimini acd23698ea Prefab Serialization | Remove "Source" parameter from prefab source file (#1387) 
* When loading a template to memory, store the current Source (potentially overriding what was stored to disk)

* Before storing the prefab disk, remove the Source parameter from the Dom (as it's no longer necessary to save it).
 2021-06-18 12:37:37 -07:00
sconel 49b3c4d11f Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into Spawnable/GameModeLoadErrorFix 2021-06-18 11:20:25 -07:00
srikappa 4d90b7cfb6 Fix bug with detachPrefab incorrectly replacing old entity aliases in patches 2021-06-18 11:19:59 -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
sconel f825e698c9 WIP fix for referenced assets being loaded before their registration 2021-06-17 17:37:00 -07: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