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/AzFramework
Esteban Papp 6fad254b59 Merge branch 'development' into optimization/unused_files
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
4 years ago
..
AzFramework Merge branch 'development' into optimization/unused_files 4 years ago
Platform ProcessWatcher fixes. (#6570) 4 years ago
Tests Add a ray cast API to the terrain system, implement it, and use it so entities can be placed on top of terrain. (#6895) 4 years ago
CMakeLists.txt Templates restricted (#6498) 4 years ago