Commit Graph

36 Commits

Author SHA1 Message Date
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Jonny Galloway f18ee01e68 Merge pull request #1517 from aws-lumberyard-dev/Atom/gallowj/dccsi_legal
pruning some files, reduced size of a image used in a test
2021-06-23 13:48:39 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
gallowj 7514d29ef1 pruning some files, reduced size of a image used in a test 2021-06-23 09:20:19 -05:00
gallowj d5916630b8 Changes related to ATOM-15021, this allows maya on py2.7 to work with .o3de\boostrap changes 2021-06-09 14:27:59 -05:00
lumberyard-employee-dm 1245e0b327 Adding Tools and Builders alias to the DccScriptingInterface gem targets (#1087)
* Adding a Tools and Builders variant to the DccScriptingInterface gem target to allow it to be used as a gem in the AtomTest project

* Adding support to ly_create_alias to be able to specify an alias with no
dependencies
Updated the SettingsRegistry.cmake generation code to support generating
a Gem target entry in the cmake_dependencies.*.setreg file when an
interface library with no dependencies is parsed
2021-06-03 15:02:03 -05:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
gallowj d53367858b Altered a variable to make usage more clear. 2021-05-27 09:50:49 -05:00
gallowj 379f0717fa transitioned from use of bootstrap.cfg to .o3de\Reigistry\bootstrap.setreg 2021-05-27 09:39:05 -05:00
gallowj 5284cf5d62 Merge remote-tracking branch 'upstream/main' into gallowj/main/DCCsi 2021-05-26 15:45:07 -05:00
Jonny Galloway 55b0a93fd6 fixed a typo 2021-05-26 12:55:22 -05:00
Jonny Galloway d77fae5c18 update
removed a line, that QT/PySide2 location no longer exists, PySide2 is not installed via a .egg in the python runtime
2021-05-26 11:56:18 -05:00
gallowj cbb85e8ef9 adding qdarkstyle to requirements.txt since we removed the package from codebase 2021-05-26 11:32:05 -05:00
gallowj 90d9e5d6d8 removing the qdarkstyle package we don't own 2021-05-26 11:30:46 -05:00
gallowj 5449c5785b Several small fixes to the DCCsi to match some o3de changes 2021-05-26 10:35:50 -05:00
lumberyard-employee-dm 21285809bf Adding back gem.json files to the Atom and AtomLyIntegration folders
which are to be seen as sub gem roots as a workaround for detecting the
location of the "gem" root for the Atom/AtomLyIntegration GEM_MODULE targets

Removed the logic in the SettingsRegistry.cmake for reading a
"gem_module_roots" key from the gem.json file in order to determine the
root of the Atom and Atom LyIntegration sub gem modules
2021-05-24 13:02:23 -05:00
amzn-sj 980c01efbf Remove call to set default param 2021-05-19 16:48:50 -07:00
amzn-sj 05fec17ebd Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 10:35:50 -07:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
gallowj a7054844ec I fixed some additional chnages to make formatting more standardized 2021-04-29 14:11:09 -05:00
gallowj ec8dd9ff88 s few more small cleanups 2021-04-29 14:09:52 -05:00
gallowj 50abfbb3f5 This is a sweep to remove bad inclusive terms like master. Also testing functionality. 2021-04-29 14:08:25 -05:00
Jonny Galloway 3fd7649a9f config update
Was using engineroot.txt as a search slug, that file no longer exists, switched to engine.json
2021-04-29 14:03:07 -05:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
Chris Santora 33745fdad1 Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040
Note there were significant conflicts in LightingModel.azsli and StandardPBR_ForwardPass.azsl. I only did basic resolves of these conflicts, mostly preserving the changes from main and distarding the changes in the local branch. The shaders are not compiling at this point, and of course the tests are not passing. I will fix up the code to make corrections in a separate commit, to make it easier to review those changes separate from this merge.
2021-04-20 16:59:27 -07:00
Chris Santora 94b11e5c8f Replaced StandardPBR_DiffuseOcclusionState and StandardPBR_SpecularOcclusionState functor scripts with just UseTexture functors. The behavior is the basically the same and a lot simpler. All we lose is the occlusion "enable" flag, which is cleaner anyway.
ATOM-14040 Add Support for Cavity Maps
2021-04-20 16:40:10 -07:00
Chris Santora 64e625a79f Added support for cavity maps by changing the "Ambient Occlusion" material property group go just "Occlusion", which now contains properties for both "Diffuse AO" and "Specular Cavity".
Added new input attachment to the fullscreen reflection pass to receive the "ambient" gbuffer.
Added diffuse and specular occlusion to the Skin material type; it was missing before.

ATOM-14040 Add Support for Cavity Maps

Testing:
AtomSampleViewer automation, with updates that will be submitted in that repo.
Manual testing in Material Editor.
Built all AtomTest assets and opened a few test levels, with updates that will be submitted in that repo.
Made local copies of the occlusion test materials and changed replaced the material types with EnhancedPBR and Skin, and got identical results (with clear coat disabled since it works different in EnhancedPBR and is absent in Skin).
2021-04-20 12:52:56 -07:00
gallowj a9345646f8 fixing a hardcoded path typo that someone submitted on accident. 2021-04-15 13:08:13 -05: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
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
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00