Tommy Walton f5537b4b47 Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2 ...

Merge stabilization/2110 as of c3dacb1 to development

2021-11-17 11:26:41 -08:00

..

Assets

Script Canvas, replace the text replacement system to a JSON file based one (#5228)

2021-11-11 11:53:51 -08:00

Components

Script Canvas, replace the text replacement system to a JSON file based one (#5228)

2021-11-11 11:53:51 -08:00

Debugger

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

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

Framework

Gems/ScriptCanvas*

2021-09-10 20:24:15 -07:00

GraphCanvas

Script Canvas, replace the text replacement system to a JSON file based one (#5228)

2021-11-11 11:53:51 -08:00

Include/ScriptCanvas

Move Qt Toast Notifications from GraphCanvas into Framework

2021-10-20 11:15:24 -07:00

Model

[Experimental] Asset Picker Flatten View (#3589)

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

Nodes

Improved generation and look up for BehaviorProperty and updates AWS node names

2021-11-16 16:24:48 -08:00

Static

Gems/ScriptCanvas*

2021-09-10 20:24:15 -07:00

Tests

Merge branch 'development' into cmake/SPEC-7179

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

Translation

Script Canvas, replace the text replacement system to a JSON file based one (#5228)

2021-11-11 11:53:51 -08:00

Undo

Merge branch 'development' into cmake/SPEC-7179

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

Utilities

Update the FileIO Aliases (#4186)

2021-10-05 15:12:53 -05:00

View

Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2

2021-11-17 11:26:41 -08: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

Added user setting to change the Script Canvas node palette context menu

2021-11-15 11:43:16 -08:00

Settings.h

Added user setting to change the Script Canvas node palette context menu

2021-11-15 11:43:16 -08:00

SystemComponent.cpp

scan refactor is in a working state

2021-09-13 15:30:31 -07:00

SystemComponent.h

fix compile error from bad automatic merge

2021-09-30 14:26:27 -07:00