birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

52 Commits

Author SHA1 Message Date
AMZN-nggieber f5fcab75d6 Display Gem Icons in Gem Catalog (#7294) 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-31 17:06:06 -08:00
santorac f87d0f8386 Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2022-01-18 19:02:36 -08:00
AMZN-byrcolin c778606c89 Templates restricted (#6498) 
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
 2022-01-14 10:27:20 -08:00
Jonny Galloway cbba00d473 Atom/16852 (#6316) 
* discover build folder, don't assume or require

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* update config_utils, no cyclical imports

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* improved docstrings and some code formatting

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config_utils.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* dccsi bootstrap changes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixed testing for bootstrap externally

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* added note for installing substance automation toolkit for tool dev

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* based on user feedback suppress global debug by default in IDE

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* small adjustments

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
 2021-12-15 08:25:23 -08:00
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 13:55:00 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 11:10:02 -08:00
Jonny Gallowy 060c217852 Fixed .bat chain for launching maya for AtomContent gems 
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
 2021-11-05 15:00:35 -05:00
AMZN-nggieber 4721ef8298 License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272) 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-04 13:04:06 -07:00
Jonny Galloway b779f358d0 Refactor DCCsi to work better with O3DE changes (#4226) 
* moving files in refactor/re-org

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* dev env refactor/re-org

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* moving/re-org so we can deprate the SDK nomiclature

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* moving/re-org so we can deprate the SDK nomiclature

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Refactoring env so I can replace SDK with Tools folder

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* re-org and prune, from SKD to Tools

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Removing old .bat files from SDK

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updated how to retreive PYTHONHOME

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Can't use/set PYTHONHOME with DCC Tools

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* small refactor

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* repaired a missed typo (causes error)

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Added missing EntityId.h include to FocusModeInterface.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* refactor additional LY to O3DE tags

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Some design scaffold file stubs

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* stubbing in scaffold file pattern

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Removal of corrupted prefabs

Signed-off-by: Benjamin Black <benblac@amazon.com>

* refactored config_utils to maintain py2.7 support for maya 2020

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* refactored config_utils to maintain py2.7 support for maya 2020

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* pruning and cleanup

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* .env is for local dev overrides

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* .env is for local dev overrides

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* clean up init and logging patterns

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Core refactoring, config.py functional standalone

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* cleaned up some bad logging, fixed up boostrap

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixed validation errors

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fix logging issue, tiddy up

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* tiddy up maya for .bat bootstraping and launch

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* name stub, fix validation

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Co-authored-by: Benjamin Black <benblac@amazon.com>
 2021-10-21 17:03:49 -07:00
Alex Peterson 20849655ea Initial gem dependencies (#4229) 
These are immediate dependencies, and include many circular dependencies, largely amongst the Atom gems, as indicated by cmake

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-09-22 11:56:53 -07:00
Jonny Galloway 28b18a33bd Atom/gallowj/clean up atom content (#4151) 
* Update the atom content to make best practice (latest conventions)

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* file tweaks cleanup

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* correct license headers

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
 2021-09-15 14:55:14 -07:00
AMZN-AlexOteiza 9752fb009a Added pdbs for python windows in order to allow python/c++ debugging on VS (#3661) 
* Added pdbs for python windows in order to allow python/c++ debugging on VS

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Modified other places where rev1 was used

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
 2021-08-31 10:25:03 +02:00
Qing Tao c32740ad53 Removed all preview.png and references of preview.png in all Atom related gems. (#3664) 
Signed-off-by: qingtao <qingtao@amazon.com>
 2021-08-30 09:30:13 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07:00
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 16:29:27 -05:00
Mike Cronin e9dd032a75 Updated gem.json for all top-level Gems. (#1715) 
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.

Signed-off-by: Cronin <mikecro@amazon.com>

* Fixed minor formatting issues with RADTelemetry gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to QtForPython gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the Twitch gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to AWSCore gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the AtomTressFX gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the AudioEngineWwise gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the CertificateManager gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitespace in summary of CrashReporting gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the CustomAssetExample gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitespace in editorPythonBindings gem summary

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the ScriptedEntityTweener gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the Gestures gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing extra whitetspace in the summary of the GameStateSamples gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding newline to the end of the ExpressionEvaluation gem.json

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the default "requirments" field value to be empty string instead
of "None"

This works better with the ProjectManager GemInfoFromPath function.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correcting "summary" field name

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added the requirements text to the AudioEngineWwise Gem

This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-02 15:23:10 -05:00
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