Benjamin Jillich 1b96fc4361 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514 ...

# Conflicts:
#	Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

2021-06-02 19:35:50 +02:00

..

Android/ProjectBuilder

Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK

2021-05-28 23:24:51 -07:00

AssetBundler

Renamed osx_gl to mac and es3 to android for cache folders (#949)

2021-05-26 19:17:17 -05:00

AssetProcessor

LYN-4134 Automatically add --project-path=<project> to debugging parameters in Editor/AP for engine-centric (#1081)

2021-06-02 09:13:04 -07:00

AWSNativeSDKInit

Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00

AzTestRunner

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

CrashHandler

[SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows

2021-04-27 09:48:50 -07:00

DeltaCataloger

Fix Linux test failures

2021-05-24 12:24:46 -07:00

GridHub

Renamed osx_gl to mac and es3 to android for cache folders (#949)

2021-05-26 19:17:17 -05:00

News

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

ProjectManager

Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514

2021-06-02 19:35:50 +02:00

PythonBindingsExample

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

RemoteConsole

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

SceneAPI

Added [[maybe unused]] to fix release build compile issue (#1090)

2021-06-02 09:36:34 -07:00

SerializeContextTools

Add support for AP-compliant relative paths (#998)

2021-05-28 09:57:17 -05:00

Standalone

Remove or update some remaining non-inclusive terms. (#793)

2021-05-18 11:43:57 -06:00

TestImpactFramework

Add newlines to the end of all files

2021-04-23 09:43:40 -07:00

CMakeLists.txt

Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741)

2021-05-13 11:10:44 -06:00