Commit Graph

160 Commits (1431afb51a08535a0ceabc22f11a55c0e5f5bb93)

Author SHA1 Message Date
Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp
4 years ago
John Jones-Steele 740ee1f8a4 Fixed wheel working on spinbox non focussed
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
Esteban Papp 3eb658534b More Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
sphrose 181698b950
LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List (#3013)
* LY-91616 Dyn Veg: Push (up) and Pop (down) Items in Descriptor List

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Changes as per reviews.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Additional review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review change

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
Chris Galvan 2063e7f2dd Added missing header include.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan b5828e327d Moved custom tree view dragging logic from Entity Outliner to common class so it could be re-used for the UI Editor tree view.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Esteban Papp 2147b1d128 Merge branch 'development' into cmake/SPEC-7484 4 years ago
John Jones-Steele 86d0ba7e6b Minor changes to tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele 3b60862237 Fixed order of tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele 12505da6fc Changed locale handling and added tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
Esteban Papp 3f6335dc32 Fixes for AzQtComponents
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
John Jones-Steele 73706fa04e Added Tests to check code is correct
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele b1922fe95e Changed comment to reflect PR
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
John Jones-Steele a33bc107be Fixed number truncation in deisplayed values
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
Chris Galvan e6927ffc14
Merge pull request #2359 from aws-lumberyard-dev/cgalvan/ImproveAutoResizingOfDialogs
Improved auto-resizing when centering dialogs when they are first displayed.
4 years ago
Chris Galvan 8cf7f8ed7b Update to check both width and height at the same time.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan ce3b9e2917 Improved auto-resizing when centering dialogs when they are first displayed.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan edbe05bd81 Fixed Project Manager to enable save/restore of the window geometry so its window position/sizing will be restored after it is closed/re-launched. Also improved WindowDecorationWrapper logic to center by default when using the showFromSettings API for first time launch.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Guthrie Adams 7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
Addition of a base AzQtToolsApplication class
4 years ago
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>
4 years ago
jjjoness facd1e18b5
One hamburger menu to rule them all (#2232)
* Icon changes

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Icon changes to svg files

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
Dayo Lawal f215011de4 Copyright header and whitespace fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 54947791d2 Fixing copyright header
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 9c63968833 Style fixing
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 986ee5aa9b Changing cmake
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 92ead794fa Removal of AzQtAppWindow
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 27466154be AzQtApplication Window
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 656a4bb097 o3de.com to o3de.org
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal c86535f892 Styling fixes
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external)
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 96153aa8d7 On output change
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 60c89d28cc New class: AzQtTraceLogger
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 31a2ccb041 Addressing change requests for pull request
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 290567cfd7 Fixed cmake, AzQtApplication working with other tools
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 5872138671 AzQtApplication 2
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal d3d9b600f9 AzQtApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 975be6a480 MaterialEditor inheriting from ToolsApplication
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal 326dcc3d10 ToolsApplication constructor
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 5 years ago
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
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>
5 years ago
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>
5 years ago
Chris Galvan 77cc0e921c Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Terry Michaels f93c2f5b60
signoff (#1748)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
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>
5 years ago
Terry Michaels b331eea9ca
Removed the AmazonStyle executable and files as they are old/invalid (#1733)
* signoff

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
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>
5 years ago
Chris Galvan d7b516b518 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
Gene Walters bafcdfe037
Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628
Merging Stabilization/2106 into Development
5 years ago
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 5 years ago
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>
5 years ago
Terry Michaels ffc05872cc
Updated Helpers Icon per UX (#1658)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Terry Michaels 149863c527
Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
Terry Michaels 7a2a2dc0d7
Updated branding for application names (#1617) 5 years ago
Terry Michaels 21ebff5709
Updated help search and all docs.o3de.org links to o3de.org (#1594) 5 years ago
Yuriy Toporovskyy 4d99eeafd2 Merge remote-tracking branch 'upstream/stabilization/2106' into DontClobberUserEditingInVectorInput 5 years ago
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
5 years ago
John Jones-Steele 5279f05403 Entity Outliner - Sort Order options don't show current selection
Also fixes the menus that have checkmark and icon
5 years ago
Terry Michaels 1e457928f5
Update help URLs and remove unneeded links (#1520) 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
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
5 years ago
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.
5 years ago
Terry Michaels ca76a4d1ab
Moved helpers to the top level menu bar above viewport (#1464) 5 years ago
Terry Michaels 74bb2737ca
Replaced menu icon in secondary toolbar (#1459) 5 years ago
John Jones-Steele 5e4f021d55 Cherry picked from development 5 years ago
Hasareej 4ad97342c2
Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
5 years ago
John Jones-Steele 0983d1ba45 Changes made to address comments. 5 years ago
John Jones-Steele 746c57373b Merge branch 'development' into LYN-4195 5 years ago
John Jones-Steele 8a6975131d Modified the link.svg 5 years ago
John Jones-Steele ed47bb07ab Menu icon behaviour fixed. 5 years ago
Terry Michaels 91fb8be535
Added toolbar icons, updated viewport header UX (#1240) 5 years ago
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
5 years ago
Hasareej 5b940e8ed6
Viewport Ui Cluster Locked State Overlay (#1139)
* Viewport Ui Cluster Locked State Overlay

* PR feedback changes.
5 years ago
Vincent Liu eee7bb219a
[LYN-3996] Update core editor menu (#1030) 5 years ago
Hasareej ca5e629dac
Hasareej lyn 2301 cluster space 2 (#843)
Initial Implementation of the ViewportUi Space Cluster
5 years ago
Benjamin Jillich 6d7c2f1a0c
Reusable selection proxy model (#780) 5 years ago
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
5 years ago
jjjoness 552ebea135 Added Simulate button 5 years ago
sphrose d1eae23347 reduced cursor size. 5 years ago
sphrose 63b970aa04 merge from main 5 years ago
jjjoness 9a113c083d Checked all Search boxes and made them compliant with UX specs. 5 years ago
Aristo7 64d980bc03 Deleted AzFramework::AtomActiveInterface 5 years ago
lumberyard-employee-dm 3dec5d3b71
LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
5 years ago
jjjoness 2aafdab5af Added the new focus color. 5 years ago
jjjoness 051cc0bce2 Merge branch 'main' into LYN-1932 5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago