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.

Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Framework/AzCore/AzCore/azcore_files.cmake # Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif		4 years ago
..
AtomCore	Removes ThreadDrillerEvents, replaces handlers with TreadEventBus	4 years ago
AzAndroid/java/com/amazon	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago
AzCore	Merge branch 'development' into redcode/driller_removal	4 years ago
AzFramework	Merging from development	4 years ago
AzGameFramework	Update how Project Filepaths are calculated when not supplied via command line (#5194)	4 years ago
AzManipulatorTestFramework	Merging from development	4 years ago
AzNetworking	Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)	4 years ago
AzQtComponents	Merging from development	4 years ago
AzTest	Merging from development	4 years ago
AzToolsFramework	Merge branch 'development' into redcode/driller_removal	4 years ago
GFxFramework	More fixes	4 years ago
GridMate	Linux build fixes	4 years ago
CMakeLists.txt	Remove crcfix (#3294)	5 years ago