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.

Benjamin Jillich 1b96fc4361 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514 ... # Conflicts: # Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp		5 years ago
..
AWSNativeSDKInit	Integrating github/staging through commit 5f214be	5 years ago
Android/ProjectBuilder	Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK	5 years ago
AssetBundler	Renamed osx_gl to mac and es3 to android for cache folders (#949)	5 years ago
AssetProcessor	LYN-4134 Automatically add `--project-path=<project>` to debugging parameters in Editor/AP for engine-centric (#1081)	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' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514	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	Added [[maybe unused]] to fix release build compile issue (#1090)	5 years ago
SerializeContextTools	Add support for AP-compliant relative paths (#998)	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