Santi Paprika 51881f0cfd Merge remote-tracking branch 'upstream/development' into thin-transmission

2021-12-15 17:44:33 +01:00

..

Asset

LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359)

2021-12-13 14:30:53 -08:00

Bootstrap

ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153) (#5389)

2021-11-08 07:49:30 -08:00

Component

License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)

2021-11-04 13:04:06 -07:00

Feature

Merge remote-tracking branch 'upstream/development' into thin-transmission

2021-12-15 17:44:33 +01:00

RHI

Merge pull request #6377 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16886

2021-12-13 12:46:53 -07:00

RPI

Fix for GHI-4644: mesh optimization breaking skin influences (DCO fix) (#6336)

2021-12-13 13:07:04 -08:00

TestData

Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21

2021-11-11 10:15:52 -08:00

Tools

Fixed several material editor bugs related to file paths and hot reload prompts (#6374)

2021-12-14 08:52:01 -08:00

Utils

Cry Legacy: the Lessening (#5961)

2021-11-29 11:21:06 -07:00

CMakeLists.txt

Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

2021-07-16 17:50:44 -05:00

gem.json

License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272)

2021-11-04 13:04:06 -07:00