Gene Walters
bafcdfe037
Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628
...
Merging Stabilization/2106 into Development
2021-06-30 11:07:30 -07:00
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
Gene Walters
9814e9dc6c
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 16:31:06 -07:00
Gene Walters
6fb2558e44
Merge branch 'upstream/development' into genewalt/gitflow_210628
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 15:40:46 -07:00
Gene Walters
f905b71844
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 13:48:45 -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
Gene Walters
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
Terry Michaels
7a2a2dc0d7
Updated branding for application names ( #1617 )
2021-06-28 11:35:13 -05:00
AMZN-mnaumov
83d142d7dc
Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571
...
Cherry-picking thumbnail performance improvements
2021-06-25 19:18:10 -07:00
Yuriy Toporovskyy
2dd8d03654
Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest
2021-06-25 17:24:32 -07:00
Terry Michaels
21ebff5709
Updated help search and all docs.o3de.org links to o3de.org ( #1594 )
2021-06-25 15:23:57 -05:00
Danilo Aimini
9b6ef150ff
LYN-2480 | Minor fixes to the Prefab system ( #1581 )
...
Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console).
Also avoid marking templates dirty when they are added.
2021-06-25 08:53:25 -07:00
Yuriy Toporovskyy
ad2ee47ea3
Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest
2021-06-25 09:49:13 -04:00
sconel
2a1a523091
Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash
...
Fix issue where new projects would crash when exiting game mode
2021-06-24 10:50:09 -07:00
Tom Hulton-Harrop
1dfb41b6f8
Merge pull request #1512 from aws-lumberyard-dev/hultonha_LYN-4389_imgui-viewport-ui
...
Change to move Viewport UI elements to no longer overlap with ImGui menu
2021-06-24 09:38:53 +01:00
sconel
ad181205f8
Add extra space to error message for better formatting
2021-06-23 17:06:13 -07:00
sconel
f91e640741
Fix issue where new projects would crash when entering game mode
2021-06-23 16:57:57 -07:00
Terry Michaels
1e457928f5
Update help URLs and remove unneeded links ( #1520 )
2021-06-23 14:42:33 -05:00
Steve Pham
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
hasareej
e0dd33b084
Comment Update
2021-06-23 13:22:34 +01:00
hasareej
6ae20b9c9c
Fixing Issue with TopRight & BottomLeft Corners
2021-06-23 13:22:21 +01:00
hasareej
1cb780b215
Layout right side bug fix.
2021-06-23 13:21:55 +01:00
hasareej
9e0dccbf39
Initial bug fix - Added a margin.
2021-06-23 13:21:22 +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