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

..

Editor

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

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

Framework

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

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

LauncherUnified

Issues/2126 PhysX Gem can't be used as build dependency in engine SDK Part (#2337) (#2340)

2021-07-22 11:20:58 -07:00

Legacy

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

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

Tools

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

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

CMakeLists.txt

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

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