birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,822 Commits 3 Branches 3 Tags
72ea2ca1b4509364f9ab0629f8ea904ad6d55d21
Commit Graph

65 Commits

Author SHA1 Message Date
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts). 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-08 13:56:47 -05:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-07 16:37:25 -05:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911) 
* fix for [LYN-4828], message box style changes

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-07 13:49:55 -07:00
AMZN-Igarri 64697350bc LYN-4806: Switch Asset Browser Mode Button (Fix) (#1852) 
* Adding dropdown for view

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

* Adding Asset Browser Mode selector button

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

* Added display State Enum

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

* changed over to AZStd::unique_ptr

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

* added pointers

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

* Fixing pointers

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

* Fixing parenting

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

* Changes from Code Review Feedback

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

* Fixed wrong condition

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

* Added Button Icon

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

* Fixing Copyright Header

Signed-off-by: igarri <igarri@amazon.com>
 2021-07-07 10:53:21 +01:00
Chris Galvan 77cc0e921c Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-06 10:15:32 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-07-02 12:42:44 -05:00
Terry Michaels f93c2f5b60 signoff (#1748) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-07-02 07:08:12 -05:00
Danilo Aimini 02f340abbd Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-07-01 18:37:44 -07:00
Terry Michaels b331eea9ca Removed the AmazonStyle executable and files as they are old/invalid (#1733) 
* signoff

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-07-01 19:25:08 -05:00
alexmontAmazon 9ef25cb5c4 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) (#1726) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-07-01 13:59:10 -07:00
Chris Galvan d7b516b518 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-01 10:08:04 -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
Danilo Aimini 7030f663f5 LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672) 
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-06-30 15:20:42 -07:00
Chris Galvan 20775b7745 [LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-06-30 15:26:27 -05:00
Gene Walters bafcdfe037 Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628 
Merging Stabilization/2106 into Development
 2021-06-30 11:07:30 -07:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
alexmontAmazon 69f2e06134 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-06-29 17:31:27 -07:00
Terry Michaels ffc05872cc Updated Helpers Icon per UX (#1658) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 17:37:34 -05:00
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:55:32 -07:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 14:00:11 -05:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Terry Michaels 7a2a2dc0d7 Updated branding for application names (#1617) 2021-06-28 11:35:13 -05:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
Yuriy Toporovskyy 4d99eeafd2 Merge remote-tracking branch 'upstream/stabilization/2106' into DontClobberUserEditingInVectorInput 2021-06-24 12:25:49 -04:00
Yuriy Toporovskyy c27b417761 Address pr feedback 
- Use AZ warning macros instead of #pragma warning
- std::numeric_limits->AZStd::numeric_limits
- IsClose->IsCloseMag
- AZ_Warning->AZ_Assert
 2021-06-24 10:17:02 -04:00
John Jones-Steele 5279f05403 Entity Outliner - Sort Order options don't show current selection 
Also fixes the menus that have checkmark and icon
 2021-06-24 11:59:44 +01:00
Terry Michaels 1e457928f5 Update help URLs and remove unneeded links (#1520) 2021-06-23 14:42:33 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622 
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
 2021-06-22 12:55:18 -05:00
Yuriy Toporovskyy f1d2d380fa Bug fix for inability to change actor transform properties. 
Actor motion extraction applies at all times, sending transform change events to the Qt widget and overwriting any editing the user is doing.

If the user is in the middle of editing, do not overwrite the current spinbox value.
 2021-06-21 18:00:38 -04:00
Terry Michaels ca76a4d1ab Moved helpers to the top level menu bar above viewport (#1464) 2021-06-21 16:11:50 -05:00
Terry Michaels 74bb2737ca Replaced menu icon in secondary toolbar (#1459) 2021-06-21 12:50:26 -05:00
John Jones-Steele 5e4f021d55 Cherry picked from development 2021-06-21 15:28:41 +01:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398) 
Fixing the issue with the icons not appearing & deleting duplicate icons.
 2021-06-18 11:45:48 +01:00
John Jones-Steele 0983d1ba45 Changes made to address comments. 2021-06-16 11:22:59 +01:00
John Jones-Steele 746c57373b Merge branch 'development' into LYN-4195 2021-06-14 09:42:01 +01:00
John Jones-Steele 8a6975131d Modified the link.svg 2021-06-14 09:26:28 +01:00
John Jones-Steele ed47bb07ab Menu icon behaviour fixed. 2021-06-11 14:52:01 +01:00
Terry Michaels 91fb8be535 Added toolbar icons, updated viewport header UX (#1240) 2021-06-10 11:42:25 -05:00
Terry Michaels 593b679fa3 Main toolbar consolidation and cleanup (#1167) 
* Moving menu options around

* Consolidation and moving of toolbar functioanlity

* Fixed non-unity build missing header

* Updated camera icon to the correct one

* Addressed review feedback

* Addressed review feedback

* Moved icons to new folder structure/naming
 2021-06-07 18:11:56 -05:00
Hasareej 5b940e8ed6 Viewport Ui Cluster Locked State Overlay (#1139) 
* Viewport Ui Cluster Locked State Overlay

* PR feedback changes.
 2021-06-07 13:32:13 +01:00
Vincent Liu eee7bb219a [LYN-3996] Update core editor menu (#1030) 2021-05-28 10:50:23 -07:00
Hasareej ca5e629dac Hasareej lyn 2301 cluster space 2 (#843) 
Initial Implementation of the ViewportUi Space Cluster
 2021-05-26 17:12:30 +01:00
Benjamin Jillich 6d7c2f1a0c Reusable selection proxy model (#780) 2021-05-18 11:16:00 +02:00
sphrose 8ed8c26864 Merge pull request #100 from aws-lumberyard-dev/LY-105687 
LY-105687 LY 2.0 - Main editor - mouse over tab should show a hand
 2021-05-17 07:58:28 +01:00
jjjoness 552ebea135 Added Simulate button 2021-05-12 11:40:36 +01:00
sphrose d1eae23347 reduced cursor size. 2021-05-10 17:26:46 +01:00
sphrose 63b970aa04 merge from main 2021-05-10 14:36:18 +01:00
jjjoness 9a113c083d Checked all Search boxes and made them compliant with UX specs. 2021-05-10 11:46:16 +01:00