Chris Santora 688c5d1052 Merge remote-tracking branch 'upstream/stabilization/2106' into santorac/stabilization/2106/HotReloadFixes

2021-06-16 17:23:06 -07:00

..

Asset

SPEC-7178 Removal of precompiled cpp files (#1171)

2021-06-07 15:59:58 -07:00

Bootstrap

Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere

2021-05-25 23:48:55 -05:00

Component

Adding back gem.json files to the Atom and AtomLyIntegration folders

2021-05-24 13:02:23 -05:00

Feature

ATOM-15780 Improve cpu profiler allows pause and output profiling data to a file for reference (#1358)

2021-06-16 13:41:27 -07:00

RHI

ATOM-15780 Improve cpu profiler allows pause and output profiling data to a file for reference (#1358)

2021-06-16 13:41:27 -07:00

RPI

Merge remote-tracking branch 'upstream/stabilization/2106' into santorac/stabilization/2106/HotReloadFixes

2021-06-16 17:23:06 -07:00

TestData

ATOM-15295 Remove Unnecessary Enable Material Properties

2021-05-27 09:58:58 -07:00

Tools

Adding PAL implementation for Linux

2021-06-09 13:21:59 -05:00

Utils

ATOM-15780 Improve cpu profiler allows pause and output profiling data to a file for reference (#1358)

2021-06-16 13:41:27 -07:00

CMakeLists.txt

Initial commit

2021-03-08 14:30:57 -08:00

gem.json

Adding back gem.json files to the Atom and AtomLyIntegration folders

2021-05-24 13:02:23 -05:00