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

..

CryEngine

LYN-4132 Disable SIMD exceptions in profile (#1052)

2021-06-01 11:31:21 -07:00

Framework

Adding a shortcut to hide clusters. (#1071)

2021-06-02 15:54:30 +01:00

LauncherUnified

Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948

2021-05-28 11:30:13 -07:00

Sandbox

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

Tools

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

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

CMakeLists.txt

Initial commit

2021-03-08 14:30:57 -08:00