santorac 0972c4f1a3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent

2021-10-22 09:27:24 -07:00

..

Asset

Atom/galibzon/atom 4608/inline to root constant (#4897)

2021-10-22 05:52:50 -05: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 remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent

2021-10-22 09:27:24 -07:00

RHI

[atom_cpu_profiler_gem_promotion] quick small changes based on PR feedback

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

RPI

Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.

2021-10-21 23:18:08 -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

Hair and Tools Pipeline bug fixes (#4902)

2021-10-22 09:21:06 -04: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