28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
af00191e82
merge from main
2021-04-21 15:21:03 -07:00
f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
...
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
d1ba2155c5
PR feedback
2021-04-19 15:55:58 -07:00
2cd2550771
Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
...
ATOM-5921 Material Editor: Select newly created materials in the asset browser
2021-04-19 17:53:15 -05:00
34be0cd4b5
Fixing string search
2021-04-19 15:31:45 -07:00
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
...
[ATOM-15269] disabling source control thumbnails in material editor
2021-04-19 10:57:03 -07:00
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
b3cc14dd5c
disabling source control thumbnails in material editor
2021-04-16 18:59:21 -07:00
db9b0f141f
Double click launches Material Editor
2021-04-16 16:13:39 -07:00
c05b83915c
Merge pull request #115 from aws-lumberyard-dev/Atom/guthadam/ATOM-15267
...
[ATOM-15267] Material Editor: Create material dialog respects default standard PBR selection
2021-04-16 17:30:37 -05:00
854167c68e
Ensure default material selection works when dialog is opened
...
https://jira.agscollab.com/browse/ATOM-15267
2021-04-16 14:53:31 -05:00
c5c7332642
Merge pull request #92 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14101
...
[ATOM-14101] Adding "copy name" and "copy path" to Material Editor
2021-04-16 12:23:03 -07:00
d3520ddcf1
Adding "copy name" and "copy path" to Material Editor
2021-04-15 17:59:09 -07:00
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
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Burel
mnaumov
AMZN-mnaumov
Guthrie Adams
guthadam
alexpete