Esteban Papp dd3f0b86e0 Merge branch 'development' into cmake/SPEC-7484 ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ToolBox.cpp

2021-08-02 18:45:25 -07:00

..

Asset

Enable AZSLc and Shader Compilation on Linux (#2338)

2021-07-22 10:16:17 -07:00

Bootstrap

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Component

Add an Orthogonal Projection option to the Camera Gem (#2414)

2021-07-26 13:58:50 -07:00

Feature

Merge branch 'development' into cmake/SPEC-7484

2021-08-02 18:45:25 -07:00

RHI

Merge branch 'development' into cmake/SPEC-7484

2021-08-02 18:45:25 -07:00

RPI

Fixed a link error on android (clang)

2021-08-02 12:02:58 -07:00

TestData

Create XCB Connection mechanism for WSISurface implementation for Linux (#2400)

2021-07-26 13:41:28 -07:00

Tools

Merge pull request #2605 from aws-lumberyard-dev/Atom/guthadam/updating_atomtoolsappication_comments_and_formatting

2021-07-29 15:23:53 -05:00

Utils

Visualizer: use template functor over hardcoded lambdas

2021-07-29 10:08:19 -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

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

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