Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de ...

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py

2021-07-16 13:21:55 -07:00

..

Android/ProjectBuilder

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

AssetBundler

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

AssetProcessor

Restore fix lost in merge: [LY-121929] Asset Processor Error : Sqlite - Failed to prepare statement. (#2202)

2021-07-16 10:50:39 -07:00

AWSNativeSDKInit

[Android] SSL certificate error when run the AWS gem sample levels (#2060)

2021-07-13 11:25:57 -07:00

AzTestRunner

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

CrashHandler

[installer/2106-3p-license-fix] fixed issue with CrashHandler requiring 4-component version strings

2021-07-12 12:29:27 -07:00

DeltaCataloger

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

GridHub

Removed editor specialization from GridHub, it does not need the gems loaded

2021-07-14 12:10:17 -07:00

ProjectManager

Clear Build and Cache Directory After Project Move or Copy (#2184)

2021-07-15 17:48:04 -07:00

PythonBindingsExample

Resolved merge conflicts

2021-07-02 12:42:44 -05:00

RemoteConsole

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

SceneAPI

Revert "[MeshOptimizer] Determine the original vertex index based on the position (#2008)" (#2188)

2021-07-15 12:18:10 +02:00

SerializeContextTools

Merge branch 'stabilization/2106' into hultonha/gitflow_210706

2021-07-06 20:23:14 +01:00

Standalone

Final update copyright headers to reference license files at the repo root (#1693)

2021-06-30 19:51:55 -07:00

TestImpactFramework

Add handling for integrity failures when applying and resolving change lists (#1993)

2021-07-08 15:59:05 -05:00

CMakeLists.txt

Remove NewsBuilder project from Editor solution, as it is no longer used.

2021-07-08 15:51:53 -07:00