Gene Walters d2da35aec3 merging latest dev + resolving 1 conflict ...

Signed-off-by: Gene Walters <genewalt@amazon.com>

2021-10-06 16:55:58 -07:00

..

Editor

Update the FileIO Aliases (#4186)

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

Include/LyShine

Reenable blend mode and depth state options in Draw2d (#2254)

2021-09-01 15:42:16 -07:00

Pipeline/LyShineBuilder

Fixes for release builds for unused variable warnings (#4000)

2021-09-08 21:13:36 -07:00

Source

Update the FileIO Aliases (#4186)

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

Tests

Update the FileIO Aliases (#4186)

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

CMakeLists.txt

Ensuring AutomatedTest project will include LyShine for server applications. Without LyShine the server app failed to load certain modules which are currently required. Eventually we'll want a way to select render/headless modes per gem

2021-09-29 14:08:02 -07:00

lyshine_common_module_files.cmake

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

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

lyshine_editor_builder_files.cmake

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

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

lyshine_editor_tests_files.cmake

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

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

lyshine_static_files.cmake

Reenable support for UI Elements that use Render Targets (#2352)

2021-08-03 10:14:09 -07:00

lyshine_tests_files.cmake

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

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

lyshine_uicanvaseditor_files.cmake

Merge branch 'development' into cmake/SPEC-7179

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