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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/AzQtComponentsAPI.h
+1 -1
View File
@@ -14,7 +14,7 @@
/**
* \mainpage
*
* Introduced with Amazon Lumberyard version 1.25 and the release of UI 2.0, Lumberyard’s
* Introduced with Amazon Lumberyard version 1.25 and the release of UI 2.0, Lumberyard's
* custom Qt widget library provides developers with access to the same UI components used
* throughout Lumberyard. Using this library, UI developers can build their own tools and
* extensions for Lumberyard, while maintaining a coherent and standardized UI experience.
Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/entity.svg
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>icon / outliner / entity / Default</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="icon-/-outliner-/-entity-/-Default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M13.69163,3.24686842 L8.01783965,6.52512131 L2.34404932,3.24686842 L8,0.481790242 L13.69163,3.24686842 Z M7.25035308,7.82264135 L7.25035308,14.7689324 L1.9912897,11.7236967 L1.9912897,4.79310939 L7.25035308,7.82264135 Z M14.0326515,11.6884321 L8.74360561,14.7769163 L8.74360561,7.8257203 L14.0024918,4.79949203 L14.0326515,11.6884321 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 911 B

Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/entity_editoronly.svg
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>icon / outliner / entity / Editor only - Default</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="icon-/-outliner-/-entity-/-Editor-only---Default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M15.0106107,3.46465838 L15.0106107,11.8997995 L8.00571081,15.9528982 L1.01027166,11.8997995 L1.00081095,3.40042968 L7.95794074,-8.8817842e-16 L15.0106107,3.46465838 Z M7.92315739,1.65703333 L3.46844121,3.83298685 L8.01053629,6.47424813 L12.4868614,3.86919729 L7.92315739,1.65703333 Z M7.25782502,13.7898805 L7.25782502,7.7557749 L2.49854198,4.99974138 L2.45867957,11.0093537 L7.25782502,13.7898805 Z M13.5431654,11.0400952 L13.5125169,5.00820731 L8.7617356,7.73667456 L8.7617356,13.818076 L13.5431654,11.0400952 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/entity_notactive.svg
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
<title>icon / outliner / entity / Not active - Default</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="icon-/-outliner-/-entity-/-Not-active---Default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M0.221035452,3.0578346 L1.63524901,1.64362104 L14.3631711,14.3715431 L12.9489575,15.7857567 L0.221035452,3.0578346 Z M8.82584212,6.07154026 L4.78987504,2.06881544 L8,0.478222009 L13.6388498,3.2662946 L8.82584212,6.07154026 Z M7.25035308,8 L7.25035308,14.7480713 L2,11.7506476 L2,4.76554334 L7.25035308,8 Z M12.5522096,12.5834819 L8.76224473,14.7603092 C8.76224473,14.7603092 8.74784952,8.78866138 8.76224473,8.80319219 C8.77663993,8.817723 12.5522096,12.5834819 12.5522096,12.5834819 Z M9.89073807,7.16131429 L14,4.7973114 L14,11.2849265 L9.89073807,7.16131429 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/layer.svg
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
<title>icon / outliner / layer / default</title>
<desc>Created with Sketch.</desc>
<g id="icon-/-outliner-/-layer-/-default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group" transform="translate(2.000000, 1.000000)" fill="#FFFFFF">
<rect id="Rectangle" x="0" y="6" width="12" height="8" rx="1"></rect>
<rect id="Rectangle" x="1" y="3" width="10" height="2"></rect>
<rect id="Rectangle" x="2" y="0" width="8" height="2"></rect>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 807 B

Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon / prefab / default</title>
<g id="icon-/-prefab-/-default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#4A90E2"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab_edit.svg
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon / prefab / edit</title>
<g id="icon-/-prefab-/-edit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+8
View File
@@ -1,4 +1,12 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/Entity">
<file alias="entity.svg">Entity/entity.svg</file>
<file alias="entity_editoronly.svg">Entity/entity_editoronly.svg</file>
<file alias="entity_notactive.svg">Entity/entity_notactive.svg</file>
<file alias="layer.svg">Entity/layer.svg</file>
<file alias="prefab.svg">Entity/prefab.svg</file>
<file alias="prefab_edit.svg">Entity/prefab_edit.svg</file>
</qresource>
<qresource prefix="/Notifications">
<file alias="checkmark.svg">Notifications/checkmark.svg</file>
<file alias="download.svg">Notifications/download.svg</file>