guthadam
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
AMZN-mnaumov
40bca24204
Merge pull request #116 from aws-lumberyard-dev/Atom/mnaumov/LYN-3004
...
[LYN-3004] Moving thumbnail assets to AtomLyIntegration so thumbnails work in Editor
2021-04-16 16:09:44 -07:00
Alex Peterson
6924621cc1
Merge pull request #112 from aws-lumberyard-dev/github/staging
...
Integrating github/staging through commit ef88e6e
2021-04-16 15:21:17 -07:00
mnaumov
01a2ea6423
Moving thumbnail assets to AtomLyIntegration
2021-04-16 14:21:20 -07:00
alexpete
c98a1cebaa
GetDefaultView needs full View definition
2021-04-16 13:33:16 -07:00
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
e0b66223e4
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-16 11:25:59 -05:00
Jonny Galloway
82ca4bf221
Merge pull request #80 from aws-lumberyard-dev/AtomTest-Sponza
...
AtomTest Sponza Content
2021-04-15 21:45:02 -05:00
Esteban Papp
4edbf7890b
Bringing fix that has not been migrated to github yet (fixes Windows release builds)
2021-04-15 19:01:15 -07:00
guthadam
48e53ac66b
Correctingtypo
2021-04-15 13:50:29 -05:00
gallowj
a9345646f8
fixing a hardcoded path typo that someone submitted on accident.
2021-04-15 13:08:13 -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
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
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
Alex Peterson
921eb742d4
Merge branch 'main' into github/staging
2021-04-13 09:46:26 -07:00
nvsickle
2190787c40
Fix build
2021-04-09 14:19:05 -07:00
nvsickle
1dabb39b98
Migrate fixes from CodeCommit branch
2021-04-09 12:40:43 -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
Brian Herrera
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
2021-03-26 17:05:57 -07:00
alexpete
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Brian Herrera
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
2021-03-26 09:26:12 -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