Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018 ...

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

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp

2021-08-10 11:45:02 -07:00

..

AtomBridge

Merge branch 'development' into cmake/SPEC-2513_w4267

2021-08-05 14:57:24 -07:00

AtomFont

fix w4018

2021-08-05 19:43:56 -07:00

AtomImGuiTools

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

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

AtomViewportDisplayIcons

AtomLyIntegration

2021-07-27 19:29:25 -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 cmake/SPEC-2513_w4267

2021-08-05 14:57:24 -07:00

EMotionFXAtom

Rename EMotionFX class members to follow the m_ naming convention

2021-08-09 16:40:35 -07:00

ImguiAtom

AtomLyIntegration

2021-07-27 19:29:25 -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

Adds Links to Gem Directory and Documentation for Gems (#2922)

2021-08-06 10:19:35 -05:00