santorac 19dee0e37c Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate

2021-10-21 15:57:57 -07:00

..

Asset

Fixed dds loader issue with certain dds formats. (#4733)

2021-10-18 14:30:11 -07:00

Bootstrap

Hair - Hair Gem introduction to O3DE from Atom/barlev/AtomTressFX_DevRebase (#4439)

2021-10-04 10:46:31 -04:00

Component

Attempt a sanity check to ensure the Atom debug camera doesn't get an invalid aspect ratio (#4196)

2021-10-19 13:41:20 -07:00

Feature

Merge branch 'development' into Atom/rbarrand/MaterialVersionUpdate

2021-10-21 15:57:57 -07:00

RHI

[atom_cpu_profiler_gem_promotion] quick small changes based on PR feedback

2021-10-18 17:54:08 -07:00

RPI

Fixed an issue where the wrong version number was being reported in a warning message. It showed the latest version instead of the original version number.

2021-10-21 12:13:45 -07:00

TestData

Updated MaterialTypeSourceData to force users to move the "version" indicator to the new location at the top level of the json document.

2021-10-21 11:05:47 -07:00

Tools

Updated Material Editor's MaterialDocument to apply version updates to the materials that it opens.

2021-10-21 13:23:18 -07:00

Utils

[atom_cpu_profiler_gem_promotion] moved CPU profiler files from Atom into new Profiler gem

2021-10-15 19:22:26 -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

Initial gem dependencies (#4229)

2021-09-22 11:56:53 -07:00