Chris Santora 171ff47797 Fixed an inderect merge conflict where there was some new code using the AddShaderAssetJobDependency function that I replaced on the stabilization branch. So I updated the new code to use LocateReferencedSourceFile too.

2021-06-23 00:06:40 -07:00

..

Asset

Fixed an inderect merge conflict where there was some new code using the AddShaderAssetJobDependency function that I replaced on the stabilization branch. So I updated the new code to use LocateReferencedSourceFile too.

2021-06-23 00:06:40 -07:00

Bootstrap

Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)

2021-06-17 13:58:20 -05:00

Component

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

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

Feature

Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

2021-06-22 12:55:18 -05:00

RHI

Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

2021-06-22 12:55:18 -05:00

RPI

Cherrypicked fix for "Failed to find builder dependency" error message.

2021-06-22 22:20:18 -07:00

TestData

ATOM-15295 Remove Unnecessary Enable Material Properties

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

Tools

Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

2021-06-22 12:55:18 -05:00

Utils

Fix frame visualizer not closing (#1383)

2021-06-17 14:36:42 -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