Commit Graph

359 Commits

Author SHA1 Message Date
Alex Peterson 921eb742d4 Merge branch 'main' into github/staging 2021-04-13 09:46:26 -07:00
AMZN-mnaumov 1a7bf94917 Merge branch 'main' into Atom/mnaumov/ATOM-14904_2 2021-04-12 22:27:18 -07:00
mnaumov f188e1c9a7 Fixing ShaderVariantAsyncLoader shutdown not releasing it's assets 2021-04-12 16:03:10 -07:00
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 2021-04-09 12:40:43 -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