cdaddc72e8
Merge branch 'main' into sceneapi_script_autotest
2021-04-13 17:54:57 -05:00
921eb742d4
Merge branch 'main' into github/staging
2021-04-13 09:46:26 -07:00
442e15a414
Merge branch 'main' into sceneapi_script_autotest
2021-04-13 09:51:05 -05:00
63c97d6d3c
Merge branch 'main' into sceneapi_script_autotest
2021-04-12 14:27:41 -05:00
22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes
2021-04-12 12:15:45 -07:00
77d06ecef7
ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
...
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename
Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
2021-04-12 12:30:30 -05:00
cd12226849
Merge branch 'main' into github/staging
2021-04-12 08:48:09 -07:00
b8e508c2ee
Cherrypicking MeshCompiler fix
2021-04-12 08:45:38 -07:00
51f1183ff4
making scale gizmo apply uniform scale to transform
2021-04-10 15:58:42 +01:00
1c47a26494
Clarify the reason for the default view juggling in SetAsActiveViewport
2021-04-09 14:19:41 -07:00
1dabb39b98
Migrate fixes from CodeCommit branch
2021-04-09 12:40:43 -07:00
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
2021-03-26 17:05:57 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
jackalbe
Alex Peterson
jackalbe
Nicholas Van Sickle
alexpete
greerdv
nvsickle
Brian Herrera