Chris Galvan f278bbcd65 Merge pull request #2094 from aws-lumberyard-dev/cgalvan/gitflow_210712 ...

Merged stabilization/2106 to development

2021-07-12 14:05:19 -05:00

..

Asset

Merged stabilization/2106 to development; Resolved merge conflicts

2021-07-12 10:45:23 -05:00

Bootstrap

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

Component

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00

Feature

Merged stabilization/2106 to development; Resolved merge conflicts

2021-07-12 10:45:23 -05:00

RHI

Profiler: listen to OnSystemTick instead of OnFrameBegin (#1977)

2021-07-12 09:57:45 -07:00

RPI

Merged stabilization/2106 to development; Resolved merge conflicts

2021-07-12 10:45:23 -05:00

TestData

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

Tools

Merged stabilization/2106 -> development (resolved merge conflicts).

2021-07-08 13:56:47 -05:00

Utils

Profiler: listen to OnSystemTick instead of OnFrameBegin (#1977)

2021-07-12 09:57:45 -07:00

CMakeLists.txt

Added detection of gems which are not directly under an external subdirectory root (#1841)

2021-07-02 21:46:26 -05:00

gem.json

Updated gem.json for all top-level Gems. (#1715) (#1917)

2021-07-07 13:29:33 -05:00