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

..

AtomBridge

LYN-4774 Fix missing box icons inside the main Viewport (#2297)

2021-07-21 16:33:04 -07:00

AtomFont

AtomFont

2021-08-02 17:55:27 -07:00

AtomImGuiTools

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

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

AtomViewportDisplayIcons

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

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

AtomViewportDisplayInfo

Adjust debug text sizing for Vegetation Debugger in viewport. (#2183)

2021-07-16 17:49:33 -05:00

CommonFeatures

Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion

2021-07-30 14:54:14 -07:00

EMotionFXAtom

Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion

2021-07-30 14:54:14 -07:00

ImguiAtom

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

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

TechnicalArt

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

2021-07-16 15:25:48 -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