kberg-amzn 68d2536b3b Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons

2021-07-07 13:11:17 -07:00

..

Editor

Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de

2021-07-07 16:25:06 +01:00

Framework

Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore

2021-07-07 10:41:44 -07:00

LauncherUnified

Resolved merge conflicts

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

Legacy

merge stabilization/2106 into development

2021-07-06 17:34:04 +01:00

Tools

Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de

2021-07-07 16:25:06 +01:00

CMakeLists.txt

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

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