Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

2021-12-03 13:35:16 -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

Updated more node names, no longer return data type string to control tooltip display in SC

2021-11-22 10:58:09 -08:00

Debugger

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

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

Framework

Removes FileIOEventBus

2021-12-02 18:08:45 -08:00

GraphCanvas

Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload

2021-12-03 07:36:54 -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

Merge pull request #6045 from aws-lumberyard-dev/scripting/fix_translation_reload

2021-12-03 07:36:54 -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

Added support for translating variables types in the variable manager

2021-11-29 18:22:53 -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 branch 'development' into redcode/driller_removal

2021-12-03 13:35:16 -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