pappeste 95b560ba3b Merge branch 'main' into ly-as-sdk/LYN-2948 ...

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

2021-05-28 09:37:39 -07:00

..

Android/ProjectBuilder

Add newlines to the end of all files

2021-04-23 09:43:40 -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

Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-27 10:39:37 -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' into ly-as-sdk/LYN-2948

2021-05-28 09:37:39 -07: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

FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)

2021-05-27 08:45:32 -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