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

2021-08-11 14:48:24 -07:00

..

Assets

Merge branch 'development' into cmake/SPEC-7179

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

Components

remove accidental submission of commented out event handling

2021-07-30 10:07:23 -07:00

Debugger

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

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

Framework

adjust location of disabling SC unit tests on Linux

2021-07-26 13:20:08 -07:00

GraphCanvas

Merge branch 'development' into cmake/SPEC-7179

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

Include/ScriptCanvas

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

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

Model

Merge branch 'development' into cmake/SPEC-7179

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

Nodes

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

2021-07-16 15:25:48 -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

Remove empty User Functions and Script Event sections

2021-08-11 14:40:34 -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

Merge branch 'development' into cmake/SPEC-7179

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

SystemComponent.h

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

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