mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 ...

# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp

2021-06-22 12:55:18 -05: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

Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)

2021-06-17 13:58:20 -05:00

AssetProcessor

Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)

2021-06-17 13:58:20 -05:00

AWSNativeSDKInit

Integrating github/staging through commit 5f214be

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

AzTestRunner

Disable AzTest and AzTestRunner in monolithic builds

2021-06-11 14:37:12 -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

[LYN-4410] Back buttons should preserve selected gems (#1359)

2021-06-17 06:55:28 +02:00

PythonBindingsExample

Fix PythonBindingsExampleTest name

2021-06-17 19:47:01 +01:00

RemoteConsole

Add newlines to the end of all files

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

SceneAPI

Fix compile error

2021-06-21 12:27:13 -05:00

SerializeContextTools

Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18

2021-06-21 10:58:07 -07:00

Standalone

Need to keep full asset paths around in LuaIDE (#1470)

2021-06-22 07:05:42 -05:00

TestImpactFramework

Remove frontend console tests

2021-06-16 11:47:17 +01: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