Chris Galvan 356e267fe5 Merge pull request #6035 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de ...

Merged `stabilization/2110` to `development`

2021-11-30 13:02:50 -06:00

..

Asset

Merge branch 'development' into cmake/SPEC-7179

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

Builder

remove superflous comment

2021-10-05 15:05:04 -07:00

Editor

Non unity build fix

2021-11-30 08:41:27 -08:00

Include/ScriptCanvas

Merge pull request #6035 from aws-lumberyard-dev/cgalvan/gitflow_211130_o3de

2021-11-30 13:02:50 -06:00

Source

removes leftover of performance build

2021-08-31 09:31:42 -07:00

Tests

[LYN-8041] Enable relocation of the Project Game Release Layout (#5380)

2021-11-09 12:03:52 -06:00

Tools

Added support for translating variables types in the variable manager

2021-11-29 18:22:53 -08:00

CMakeLists.txt

Resolved conflict in Gems/LmbrCentral/Code/lmbrcentral_files.cmake

2021-11-30 10:44:43 -06:00

scriptcanvasgem_common_files.cmake

Remove LyShineExample Gem's dependency on LmbrCentral and address feedback from previous PR with similar fix for ScriptCanvas

2021-11-29 12:41:33 -08:00

scriptcanvasgem_debugger_files.cmake

Gems/ScriptCanvas*

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

scriptcanvasgem_editor_asset_files.cmake

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

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

scriptcanvasgem_editor_builder_files.cmake

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

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

scriptcanvasgem_editor_files.cmake

Renamed controller.ui --> view.ui, minor tweaks in response to PR

2021-10-05 17:46:55 -07:00

scriptcanvasgem_editor_shared_files.cmake

Merge branch 'development' into cmake/SPEC-7179

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

scriptcanvasgem_editor_static_files.cmake

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

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

scriptcanvasgem_editor_tests_files.cmake

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

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

scriptcanvasgem_editor_tools_files.cmake

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

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

scriptcanvasgem_game_files.cmake

Merge branch 'development' into cmake/SPEC-7179

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

scriptcanvasgem_headers.cmake

Remove dependency of ScriptCanvasPhysics on ScriptCanvas gem to fix runtime dependency conflict

2021-11-24 22:34:04 -08:00

scriptcanvasgem_runtime_asset_files.cmake

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

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

scriptcanvasgem_tests_files.cmake

Merge branch 'development' into cmake/SPEC-7179

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