Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Viewport.h
2021-09-13 08:59:24 -07:00
parent 5815b48a00 d884eef0f4
commit 972944e762
189 changed files with 325 additions and 358 deletions
@@ -21,7 +21,7 @@ add_subdirectory(assetpipeline)
 add_subdirectory(atom_renderer)

 ## Physics ##
-add_subdirectory(physics)
+add_subdirectory(Physics)

 ## ScriptCanvas ##
 add_subdirectory(scripting)
--- a/Show More
+++ b/Show More