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/Tools
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
..
AWSNativeSDKInit Integrating github/staging through commit 5f214be 5 years ago
Android/ProjectBuilder Add newlines to the end of all files 5 years ago
AssetBundler Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
AssetProcessor Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
AzTestRunner Add newlines to the end of all files 5 years ago
CrashHandler [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows 5 years ago
DeltaCataloger Fix Linux test failures 5 years ago
GridHub Renamed osx_gl to mac and es3 to android for cache folders (#949) 5 years ago
News Add newlines to the end of all files 5 years ago
ProjectManager Merge branch 'main' into ly-as-sdk/LYN-2948 5 years ago
PythonBindingsExample Add newlines to the end of all files 5 years ago
RemoteConsole Add newlines to the end of all files 5 years ago
SceneAPI Merge branch 'main' into transform-float-scale 5 years ago
SerializeContextTools Fixed extra qualification causing compile error on Mac. 5 years ago
Standalone Remove or update some remaining non-inclusive terms. (#793) 5 years ago
TestImpactFramework Add newlines to the end of all files 5 years ago
CMakeLists.txt Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741) 5 years ago