Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused ...

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

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp

2021-08-25 14:50:05 -07:00

..

Objects

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 14:50:05 -07:00

Tests

Merge branch 'development' into cmake/SPEC-7179

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

UI

Code/Editor

2021-08-20 17:53:14 -07:00

CMakeLists.txt

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

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

componententityeditorplugin_files.cmake

Merge branch 'development' into cmake/SPEC-7179

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

componententityeditorplugin_test_files.cmake

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

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

ComponentEntityEditorPlugin.cpp

Remove ResourceSelectorHost and clean up/refactor related bits (#3050)

2021-08-16 12:41:24 -05:00

ComponentEntityEditorPlugin.h

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

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

ComponentEntityEditorPlugin.mf

git mv Code\Sandbox\Plugins Code/Editor/Plugins

2021-06-29 13:55:31 -07:00

dllmain.cpp

Merge branch 'development' into cmake/SPEC-7179

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

SandboxIntegration.cpp

Code/Editor

2021-08-20 17:53:14 -07:00

SandboxIntegration.h

Code/Editor

2021-08-20 17:53:14 -07:00