Commit Graph

16 Commits

Author SHA1 Message Date
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
rgba16f 9de6bdcf2b First pass to remove AtomShim
Removed CryRenderAtomShim folder from Gems/AtomLyIntegration/CMakeLists.txt
Set LOAD_LEGACY_RENDERER_FOR_EDITOR to false
2021-04-20 11:58:55 -05: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
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 2021-04-14 17:43:20 -05:00
amzn-sj 7609248c49 Fix build errors 2021-04-14 15:42:24 -07:00
Terry Michaels 78e5a069fa Removed Cry branding on error messages (#41) 2021-04-14 14:31:44 -05:00
mcgarrah 957945f809 Clarified the error message that is output when the project.json is not found 2021-04-13 19:50:06 -05:00
mcgarrah 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path 2021-04-13 19:42:30 -05:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -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
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00