chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

2021-09-02 18:14:39 -07:00

..

Assets

Fix dependency errors after conversion to JSON

2021-09-02 16:39:04 -07:00

Components

Fix list of manual inspection graphs

2021-09-02 18:14:00 -07:00

Debugger

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Framework

working support for editor property json serialization

2021-08-12 10:24:16 -07:00

GraphCanvas

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Include/ScriptCanvas

Fix list of manual inspection graphs

2021-09-02 18:14:00 -07:00

Model

[Experimental] Asset Picker Flatten View (#3589)

2021-09-01 09:39:44 +01:00

Nodes

hot fix for json event input serialization

2021-08-31 14:07:19 -07:00

Static

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Tests

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Translation

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Undo

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Utilities

Minimal TypeInfo header/reduce std interdependencies. (#2688)

2021-08-10 19:07:01 -05:00

View

Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

2021-09-02 18:14:39 -07:00

QtMetaTypes.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

ReflectComponent.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

ReflectComponent.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

ScriptCanvasEditorGem.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Settings.cpp

Merge branch 'development' into cmake/SPEC-7179

2021-07-16 15:42:37 -07:00

Settings.h

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

SystemComponent.cpp

Gems/ScriptCanvas

2021-08-20 18:01:54 -07:00

SystemComponent.h

Fix list of manual inspection graphs

2021-09-02 18:14:00 -07:00