Commit Graph

217 Commits

Author SHA1 Message Date
AMZN-mnaumov 5ef212624f Merge pull request #53 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5659
[ATOM-5659] Adding "Open Material Editor" action to Material Component slot context
2021-04-16 12:54:31 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
guthadam 48e53ac66b Correctingtypo 2021-04-15 13:50:29 -05:00
guthadam 2baa0db2de Standardizing dialog button boxes across material editor and component
Making dialogs modal

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

https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
greerdv 2bfb93e5e1 fixing non-uniform scale for mesh on activation 2021-04-15 12:34:35 +01:00
greerdv d8169e08fb merging from main 2021-04-15 08:18:11 +01:00
pruiksma 243af5f697 ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists. Adding simple point and simple spot feature processors to the thumbnail scene descriptor. 2021-04-14 23:13:31 -05:00
mnaumov a23a2fba65 PR feedback 2021-04-14 17:47:37 -07:00
greerdv 2fb2813b48 updating atom mesh component to support non-uniform scale component 2021-04-14 14:05:59 +01:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
mnaumov 5050de2604 Adding "Open Material Editor" action to Material Component slot context menu 2021-04-13 15:05:05 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00