You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
o3de/Code/Framework/AzToolsFramework
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
4 years ago
..
AzToolsFramework Add JSON serializer support for the Lua component properties 4 years ago
Platform Shorten copyright headers by splitting into 2 lines (#2213) 4 years ago
Tests Merge branch 'development' into cmake/SPEC-2513_w4018 4 years ago
CMakeLists.txt Add an integration test to validate pick mode crash (#2935) 4 years ago