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

113 Commits

Author SHA1 Message Date
Dayo Lawal c1998d8d3c AtomToolsApplication working with SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:57 -05:00
Dayo Lawal 002a4a4a21 AtomToolsApplication working with MatEditor 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-22 11:27:55 -05:00
Dayo Lawal 0ffd151da6 Removing name setting in main.cpp for Atom tools 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-19 12:42:38 -05:00
Dayo Lawal 6a0257b509 Reverting changes to AtomTools windows 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-15 16:23:56 -05:00
Dayo Lawal 9c63968833 Style fixing 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:40 -05:00
Dayo Lawal 92ead794fa Removal of AzQtAppWindow 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:35 -05:00
Dayo Lawal d36d1defab Styling fixes and AzQtAppWindow changes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:32 -05:00
Dayo Lawal 27466154be AzQtApplication Window 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:30 -05:00
Dayo Lawal c86535f892 Styling fixes 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:25 -05:00
Dayo Lawal c63c42c7f4 Adding comments and changing QApplication org/app names 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:23 -05:00
Dayo Lawal 6f44393f3a Moved logging to AzToolsFramework, working with MatEditor and SMC 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:21 -05:00
Dayo Lawal b365f8bddf Fixing problem with FileIO (exception in Environment.h) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:19 -05:00
Dayo Lawal df18e53ab4 WriteStartupLog() not implemented 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:17 -05:00
Dayo Lawal f930185077 WriteStartupLog() implemented in base class (unresolved external) 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:14 -05:00
Dayo Lawal ecede42501 Fixing logging and cleaning up AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:12 -05:00
Dayo Lawal 81c3414cd1 Adding back OnOutput to MaterialEditor for override 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:10 -05:00
Dayo Lawal e45028c9d8 Fixing MaterialEditorApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:03 -05:00
Dayo Lawal 31a2ccb041 Addressing change requests for pull request 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:29:01 -05:00
Dayo Lawal 1cadf34dc3 Removing commenting and unnecessary header files 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:58 -05:00
Dayo Lawal 5872138671 AzQtApplication 2 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:53 -05:00
Dayo Lawal d3d9b600f9 AzQtApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:51 -05:00
Dayo Lawal 975be6a480 MaterialEditor inheriting from ToolsApplication 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
 2021-07-13 19:28:49 -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
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
guthadam 104e24519c ATOM-15861 fixed material editor screen capture and test scripts 2021-06-25 11:57:29 -05:00
Qing Tao c29cfaafa4 ATOM-15287 Materials Disappear When Hot Reloading Parent Materials (#1532) 
The issue was because the material wasn't compiled when creating the draw packet
 2021-06-23 16:23:40 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
mnaumov 5a276b11b0 Fixing includes 2021-06-21 16:56:06 -07:00
mnaumov 4de1d90994 [ATOM-15292] Camera no longer resets when typing something 2021-06-21 16:52:05 -07:00
guthadam 7e231c8e36 LYN-4547 prepending O3DE to the material editor application name 2021-06-16 23:37:43 -05:00
guthadam 1339d453fc Adding PAL implementation for Linux 2021-06-09 13:21:59 -05:00
guthadam af42705bc9 Fixing linux build 2021-06-09 12:49:35 -05:00
guthadam 6675d06b67 Fixing linux build 2021-06-09 12:32:55 -05:00
guthadam 0fbeec7f17 Enabling linux compilation 2021-06-09 11:57:21 -05:00
guthadam d67628d88c ATOM-15701 changed material inspector highlight color 2021-06-07 18:23:40 -05:00
Chris Santora de4e6957e8 Made a bunch of display name and description updates to core material types. 
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).

ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
 2021-05-28 13:38:56 -07:00
guthadam c2822a4063 ATOM-15649 sorting material types in create material dialog 2021-05-27 13:17:51 -05:00
greerdv d8b74110ff Merge branch 'main' into transform-float-scale 2021-05-25 16:28:28 +01:00
AMZN-mnaumov 5788c379bb Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538 
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
 2021-05-24 21:51:33 -07:00
mnaumov 78451c5898 PR feedback 2021-05-24 17:34:04 -07:00
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 2021-05-24 23:01:29 +01:00
AMZN-mnaumov 26a1b96380 Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463 
[ATOM-15463] Adjusting combo box width
 2021-05-24 12:03:37 -07:00
guthadam a05b131cc8 ATOM-15612 fix material editor crash when group doesn't exist 2021-05-24 10:39:55 -05:00
greerdv 945f55378e merge from main 2021-05-24 11:27:43 +01:00
mnaumov 6ee8c6daa5 [ATOM-15538] Material Editor camera zoom speed adjusts to model size 2021-05-21 20:34:42 -07:00
mnaumov 5c18c6ee47 Adjusting combo box width 2021-05-21 19:54:13 -07:00
greerdv 7def4741cd merge from main 2021-05-19 12:14:25 +01:00
Chris Santora 70c8ef99ef Updates in response to code review, from gadams3. 
Cleaned up code around MaterialFunctor's QueryMaterialPropertyMetadata and QueryMaterialPropertyGroupMetadata.
Removed unnecessary "groupHeader->setObjectName(...)"
Simplified code in MaterialInspector::OnDocumentPropertyGroupVisibilityChanged.
 2021-05-13 09:39:01 -07:00
Chris Santora e429c8e06a Fixed issues after merging latest main, as well as some edge cases I didn't notice before. 
The structure of InspectorWidget::m_groups changed, so I had to update my new code accordingly.
Updated the InspectorWidget::m_groups code a bit to be more readable.
Discovered the initial property group visiblity state wasn't being set correctly when a material was first opened, so groups weren't initially hidden when they should have been. This had to be fixed in different ways for MaterialEditor's inspector and MaterialComponent's inspector.

ATOM-14688 Disable Individual Layers
 2021-05-12 23:28:05 -07:00
Chris Santora 37a1b77d50 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-12 17:45:28 -07:00