Commit Graph

29 Commits

Author SHA1 Message Date
Guthrie Adams 3b4e424d38 Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
jackalbe 5c3e5aa7db removing all to_lower() 2021-04-19 11:26:15 -05:00
jackalbe 387dd1e43a normalizing Linux path 2021-04-19 11:09:55 -05:00
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 2021-04-19 09:32:29 -05:00
guthadam 8fead27c45 ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
Remove option from presets

Updated code to select current default options

Will data drive default options with editor settings or settings registry in upcoming tasks

https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
jackalbe 3d91b19c19 printing wrong asset ID in message
cleaned up comment
2021-04-16 15:41:03 -05:00
jckand 3e9c086872 LYN-2764: Replacing image asset for ImageGradient automated test 2021-04-16 14:40:44 -05:00
jackalbe 085aa78ec9 Merge branch 'main' into sceneapi_script_regression 2021-04-16 14:29:47 -05:00
jackalbe 3299730899 re-adding EPB tests 2021-04-16 14:23:01 -05:00
jackalbe f0cf27b8d3 adding the testing files for testing for python asset building and scripting
the scene_api gets a small update for mesh_group_add_advanced_coordinate_system(self,
2021-04-16 13:58:57 -05:00
moudgils b8ab5be3bb Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI 2021-04-15 21:04:00 -07:00
Esteban Papp 4edbf7890b Bringing fix that has not been migrated to github yet (fixes Windows release builds) 2021-04-15 19:01:15 -07:00
moudgils 61c24084e8 Enable Null RHI for AutomatedTesting 2021-04-15 16:13:22 -07:00
jackalbe 80f8c0f68b behavior context class SceneGraph::NodeIndex -> "NodeIndex" 2021-04-15 13:21:24 -05:00
Ulugbek Adilbekov ebebc05cd1 Reenable Blast Automated tests (#42)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-04-15 16:16:31 +01:00
lumberyard-employee-dm 8019312b35 Merge pull request #28 from aws-lumberyard-dev/LYN-2883
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
2021-04-14 20:55:27 -05:00
dmcdiarmid-ly b5386fd53b Merge pull request #54 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2735
[LYN-2735] The Editor crashes upon creating a level when the Prefab system has been disabled in a new project
2021-04-14 15:51:04 -07:00
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 2021-04-14 17:43:20 -05:00
mcgarrah fa9366b810 Updating the AutomatedTesting project to support being built as an External Project 2021-04-13 19:35:59 -05:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete e6c12499f7 Added raytracingscenesrg.srgi to the default project template and AutomatedTesting project.
Added assert to check for successful load of the raytracingscenesrg asset.
2021-04-13 14:05:48 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
oyongzhi 7dfc79faa0 Move Batch_2_main test block back to main from sandbox. Move single FastScaneWorks_FasterThanFullScan test to sandbox. 2021-04-01 15:49:11 +01:00
oyongzhi fbeb728a61 Move flaky AssetPipelineTests.Batch_2_Main to sandbox 2021-04-01 15:17:40 +01:00
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 2021-03-26 17:05:57 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00