birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into Atom/santorac/NewLayeringWorkflow

Browse Source
This commit is contained in:
Chris Santora
2021-05-19 16:57:49 -07:00
parent 1684c338b2 8dbcd9f199
commit f3099aa7d5
1648 changed files with 14429 additions and 94150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/AtomToolsFramework/gem.json
-17
View File
@@ -1,17 +0,0 @@
{
"gem_name": "AtomToolsFramework",
"GemFormatVersion": 4,
"Uuid": "3e0ee0c27f204f5188146baac822d020",
"Name": "AtomToolsFramework",
"DisplayName": "AtomToolsFramework",
"Version": "0.1.0",
"Summary": "AtomToolsFramework",
"Tags": [ "Untagged" ],
"IconPath": "preview.png",
"Modules": [
{
"Name": "Editor",
"Type": "EditorModule"
}
]
}
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Hermanubis.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac53da9855838fcf6782c990247c69c14c2ff5c10624dc5afe89617def9cc7ca
size 9021888
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Hermanubis.modelpreset.azasset
+15
View File
@@ -0,0 +1,15 @@
{
"Type": "JsonSerialization",
"Version": 1,
"ClassName": "AZ::Render::ModelPreset",
"ClassData": {
"displayName": "Hermanubis",
"modelAsset": {
"assetId": {
"guid": "{1F650917-AA74-5107-9C49-648C957B33DA}",
"subId": 275904906
},
"assetHint": "materialeditor/viewportmodels/Hermanubis.azmodel"
}
}
}
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Lucy.fbx
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec4187f51a4b598fc075f48dd7edb7728b14b285a95530228428a8c3f43c25fc
size 10931856
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Lucy.modelpreset.azasset
-15
View File
@@ -1,15 +0,0 @@
{
"Type": "JsonSerialization",
"Version": 1,
"ClassName": "AZ::Render::ModelPreset",
"ClassData": {
"displayName": "Lucy",
"modelAsset": {
"assetId": {
"guid": "{CF4634D9-EC73-51D4-8F8E-AA25E7A6561A}",
"subId": 277335264
},
"assetHint": "materialeditor/viewportmodels/lucy.azmodel"
}
}
}
Gems/Atom/Tools/MaterialEditor/gem.json
-58
View File
@@ -1,58 +0,0 @@
{
"gem_name": "MaterialEditor",
"Dependencies": [
{
"Uuid": "a218db9eb2114477b46600fea4441a6c",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "Atom RPI"
},
{
"Uuid": "b58e5eed0901428ca78544b04dbd61bd",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "Atom Feature Common"
},
{
"Uuid": "b658359393884c4381c2fe2952b1472a",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "EditorPythonBindings"
},
{
"Uuid": "3e0ee0c27f204f5188146baac822d020",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "AtomToolsFramework"
},
{
"Uuid": "9d10b00be96045caa64c705e5772cb64",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "ImageProcessingAtom"
},
{
"Uuid": "4e981f3b17394f5d84d674fff0f54f4f",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "AtomLyIntegration.CommonFeatures"
}
],
"GemFormatVersion": 4,
"Uuid": "36f854c260b84d438dde4bc5789d8123",
"Name": "MaterialEditor",
"DisplayName": "Material Editor",
"Version": "0.1.0",
"LinkType": "Dynamic",
"Summary": "Tools for editing Atom materials",
"Tags": ["Untagged"],
"IconPath": "preview.svg",
"Modules": [
]
}
Gems/Atom/Tools/ShaderManagementConsole/gem.json
-50
View File
@@ -1,50 +0,0 @@
{
"gem_name": "ShaderManagementConsole",
"Dependencies": [
{
"Uuid": "a218db9eb2114477b46600fea4441a6c",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "Atom RPI"
},
{
"Uuid": "b658359393884c4381c2fe2952b1472a",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "EditorPythonBindings"
},
{
"Uuid": "3e0ee0c27f204f5188146baac822d020",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "AtomToolsFramework"
},
{
"Uuid": "9d10b00be96045caa64c705e5772cb64",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "ImageProcessingAtom"
},
{
"Uuid": "4e981f3b17394f5d84d674fff0f54f4f",
"VersionConstraints": [
"~>0.1.0"
],
"_comment": "AtomLyIntegration.CommonFeatures"
}
],
"GemFormatVersion": 4,
"Uuid": "77967ca0a6264a8e95b138a31bf78fe0",
"Name": "ShaderManagementConsole",
"DisplayName": "Shader Management Console",
"Version": "0.1.0",
"LinkType": "Dynamic",
"Summary": "Shader Management Console",
"IconPath": "preview.svg",
"Modules": [
]
}