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

Merge remote-tracking branch 'upstream/main' into AtomDebugDisplayFixes

Browse Source
This commit is contained in:
rgba16f
2021-04-29 19:01:52 -05:00
parent cb8cfe56f7 cdad99cefa
commit 11f4877903
2207 changed files with 4505 additions and 5094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
+2 -2
View File
@@ -48,8 +48,8 @@ namespace AZ
"AssetCollectionAsyncLoaderTest", "The AssetCollectionAsyncLoaderTest component allows you to test the API provided by AssetCollectionAsyncLoader")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::Category, "Test")
->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Comment.svg")
->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Comment.png")
->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Comment.svg")
->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Comment.png")
->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c), AZ_CRC("Layer", 0xe4db211a) }))
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
->DataElement(AZ::Edit::UIHandlers::LineEdit, &AssetCollectionAsyncLoaderTestComponent::m_pathToAssetListJson, "", "Path To Asset List")
Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+2 -2
View File
@@ -99,8 +99,8 @@ void FlyCameraInputComponent::Reflect(AZ::ReflectContext* reflection)
editContext->Class<FlyCameraInputComponent>("Fly Camera Input", "The Fly Camera Input allows you to control the camera")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute("Category", "Gameplay")
->Attribute("Icon", "Editor/Icons/Components/CameraRig.svg")
->Attribute("ViewportIcon", "Editor/Icons/Components/Viewport/CameraRig.png")
->Attribute("Icon", "Icons/Components/CameraRig.svg")
->Attribute("ViewportIcon", "Icons/Components/Viewport/CameraRig.png")
->Attribute("AutoExpand", true)
->Attribute("AppearsInAddComponentMenu", AZ_CRC("Game", 0x232b318c))
->DataElement(0, &FlyCameraInputComponent::m_moveSpeed, "Move Speed", "Speed at which the camera moves")