Commit Graph

16 Commits

Author SHA1 Message Date
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
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