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.

pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948 ... # Conflicts: # CMakeLists.txt # Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h # Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json # cmake/LYWrappers.cmake # cmake/SettingsRegistry.cmake # scripts/o3de/tests/unit_test_current_project.py		5 years ago
..
AtomCore	ATOM-15358 : Culling concurrency checker fails in AtomSampleViewer (merge from 1.0->main)	5 years ago
AzAndroid/java/com/amazon	Remove bootstrap.cfg and references to it.	5 years ago
AzAutoGen	Add newlines to the end of all files	5 years ago
AzCore	Merge branch 'main' into ly-as-sdk/LYN-2948	5 years ago
AzFramework	Merge branch 'main' into ly-as-sdk/LYN-2948	5 years ago
AzGameFramework	External Project Build Path Support using SDK Binaries (#690)	5 years ago
AzManipulatorTestFramework	remove unneeded temporary	5 years ago
AzNetworking	Remove flaky test from AzNetwork instead of using retry	5 years ago
AzQtComponents	Hasareej lyn 2301 cluster space 2 (#843)	5 years ago
AzTest	Re-enable and fix failing AZ_NETWORKING_TESTS on Linux	5 years ago
AzToolsFramework	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
Crcfix	Add newlines to the end of all files	5 years ago
GFxFramework	Add newlines to the end of all files	5 years ago
GridMate	update network code to use uniform scale on Transform	5 years ago
Tests	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
CMakeLists.txt	Add newlines to the end of all files	5 years ago