birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,280 Commits 3 Branches 3 Tags
30c366366ed9892fa79a47ec6b7a44dc81cb4dc3
Commit Graph

8280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Liu 30c366366e Improve gamelift unit test by checking handler invocation (#5030) 
Signed-off-by: onecent1101 <liug@amazon.com>
 2021-10-27 09:56:30 -07:00
AMZN-Phil 3165cf2838 Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter 
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
 2021-10-27 09:28:16 -07:00
AMZN-Phil 7fc0f14a1b Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown 
Fix Issue When Removed Project is Still Shown if it Was The Last Project
 2021-10-27 09:28:06 -07:00
galibzon cf90d7a594 ShaderVariantAssetBuilder: Provide registry property to disable (#5029) 
The registry property name is:
"/O3DE/Atom/Shaders/BuildVariants"
Default value is <true>.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-27 10:05:26 -05:00
Chris Galvan d332f7c4c7 Merge pull request #5023 from aws-lumberyard-dev/cgalvan/AddComponentTypeIconAPI 
Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
 2021-10-27 08:04:53 -05:00
moraaar a29623e5f0 Fixed editor crash using cylinder shape component (#5037) 
Fixed cylinder shape by considering shape config list to be empty.

The crash came from clearing shape config list when cylinder height is zero, but when the height is restored to zero it was expecting an element in the list.

The code to set the shape configuration was the same for many shape types, so it has been refactored to a helper function.

Fixes #4999
 2021-10-27 13:34:43 +01:00
santorac 049112d8fa Merge pull request #5027 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided 
Removed reference to opacity.doubleSided property that no longer exists.
 2021-10-26 18:54:12 -07:00
Chris Burel e4c69a29fa [Linux] Update Qt package to include xcb GL integration plugin (#4976) 
Fixes #3132.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-26 18:45:33 -05:00
galibzon 42a14079f2 Fix naming for DisableOptimizations vs DxcDisableOptimizations (#5016) 
Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 17:48:28 -05:00
santorac 8fd3461863 Removed reference to opacity.doubleSided property that no longer exists. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-26 15:38:09 -07:00
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-26 15:47:17 -05:00
Adi Bar-Lev 707730ebbc Hair - bug fix resulted from change in pass fetch using the new pipeline filter (#5013) 
Signed-off-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>

Co-authored-by: Adi-Amazon <Adi Bar-Lev barlev@amazon.com>
 2021-10-26 15:26:54 -04:00
AMZN-Phil 856318005c Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 2021-10-26 11:01:02 -07:00
hershey5045 e22235ec5b Add OpenImageIO as runtime dependency in AtomLyIntegration. (#4987) 
* Add OpenImageIO as runtime dependency in AtomLyIntegration.

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

* Place 3rdparty import inside if block.

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

* Add platform cmake files for other platforms to prevent compile errors.

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

Co-authored-by: rbarrand <rbarrand@amazon.com>
 2021-10-26 10:40:30 -07:00
sphrose e9b5a51d9f Fix console warning when adding TerrainWorldRendererComponent (#4964) 
* Fix console warning when adding TerrainWorldRendererComponent

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

* Change default value

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-10-26 12:39:39 -05:00
santorac 3913d91251 Merge pull request #4983 from aws-lumberyard-dev/Atom/santorac/MoveDoubleSided 
Moved DoubleSided Flag Out Of Opacity Group

The double-sided flag was hidden inside the opacity property group, and only exposed when you set the opacity to non-opaque. Here we move doubleSided from opacity to general making it easier to find and set.

Also...
- Fixed a bug with the material version auto-update, where it could rename properties but could not move them to another group.
- Added another "default" texture map to the Common/Feature gem that is directional, so better for understanding UV/tangent space. These were copied from the AtomLyIntegration gem.
 2021-10-26 10:36:41 -07:00
galibzon a945fd9f1b Removed ShaderAsset related unncessary warning (#5008) 
Removed ShaderAsset related unncessary warning that pollutes the logs.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 12:27:40 -05:00
galibzon b541d69efc DXC Validation Error Difficult to See in AP Window (#4982) 
* DXC Validation Error Difficult to See in AP Window

Renamed ReportErrorMessages() as ReportMessages()
All the message will be printed as a single AZ_Error()
or AZ_Warning() instead of mingled AZ_Error/AZ_Warning/AZ_TRacePrintf
which was making the output hard to read.

Signed-off-by: garrieta <garrieta@amazon.com>
 2021-10-26 12:19:12 -05:00
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 09:46:54 -07:00
jonawals a2eca9de3d Merge pull request #4998 from aws-lumberyard-dev/LYN-5265_state_tracker_impl 
Add Focus Mode integration tests.
 2021-10-26 17:16:25 +01:00
santorac b80e55229f Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MoveDoubleSided 2021-10-26 09:07:23 -07:00
nggieber b3c9573b10 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into stabilization/2110 2021-10-26 08:58:18 -07:00
Steve Pham 22a287d046 Fix to set the Taskbar name and Game Launcher window title to the name of the Project (#4986) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-26 08:56:37 -07:00
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 08:42:22 -07:00
AMZN-Phil 767466c57b Merge pull request #4979 from aws-lumberyard-dev/Prism/jsonpythonexceptionfix 
Fix old references to gem_list
 2021-10-26 08:31:44 -07:00
AMZN-Phil 6b3fc0ff8b Merge pull request #4981 from aws-lumberyard-dev/Prism/gemdownloadcallfix 
Re-add call used to initiate gem download
 2021-10-26 08:31:03 -07:00
Chris Burel f3499011ac [Mac] Fix QtEditorApplication_mac include (#4978) 
Commit 8e03d6f306 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-26 08:30:51 -07:00
nggieber 77d05b0bc9 Merge branch 'stabilization/2110' into Prism/RemoteGemWarning 2021-10-26 07:39:56 -07:00
nggieber cd295cc38b Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard-dev/o3de into stabilization/2110 2021-10-26 07:34:36 -07:00
John c2105b0631 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-26 15:30:08 +01:00
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 07:22:47 -07:00
moraaar 057c8e0d4e Fixed error: unused variable 'physxMaximumMaterialIndex' (#4989) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-10-26 13:58:21 +01:00
santorac 5cbbbb4f20 Merge pull request #4980 from aws-lumberyard-dev/Atom/santorac/UnusedVariable 
Fixed potential unused variable 'originalVersion'
 2021-10-25 19:46:28 -07:00
Danilo Aimini 1bc2968330 Resolve minor hover state bugs on the Entity Outlier (branches detect hover state separately from the rest of the columns) (#4977) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-25 17:47:54 -07:00
santorac eb542bfe69 Merge branch 'stabilization/2110' into Atom/santorac/MoveDoubleSided 2021-10-25 16:10:45 -07:00
AMZN-Phil 423693d16b Re-add call used to initiate gem download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 16:05:19 -07:00
santorac 144af200bf Fixed potential unused variable 'originalVersion' with 'maybe_unused' attribute. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-25 16:02:55 -07:00
chiyenteng 4e6f1981b9 Hold arrow keys to move selected element in UI editor (#4968) 
* Hold arrow keys to move selected element in UI editor

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

* Fix nits

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

* Hold arrow keys to move selected element in UI editor

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

* undo enum changes

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

* remove extra spaces

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

* fix comments

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

* refactor key event code

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-10-25 15:59:31 -07:00
AMZN-Phil bec24a85bf Fix old references to gem_list 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 15:59:30 -07:00
Danilo Aimini 3b4b8c3549 Move the initialization of m_editorEntityUiInterface higher so that it's initialized when the interface is set up. (#4972) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-25 15:12:34 -07:00
santorac 59da09c68b Now that we have material version auto update support, I remove the old opacity.doubleSided property and added a rename versionUpdate step to rename it to general.doubleSided. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-25 13:35:00 -07:00
santorac 0f60d37fec Fixed a bug where material version updates didn't support moving a property from one group to another. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-25 13:32:32 -07:00
Qing Tao a5694a5ac6 ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface (#4739) (#4963) 
* ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface
Introduced new PassSystemInterface::ForEachPass() funtion to replace PassSystemInterface::FindPasses(), PassSystemInterface::GetPassesByTemplateName and ParentPass::FindPassByNameRecursive() functions.
Update all the places which were using those three functions.
The new pass finding filter support any combination of pass name, pass template name, pass class type, pass hirechary, owner scene, owner render pipeline.
Update unit tests.

Signed-off-by: Qing Tao <qingtao@amazon.com>
(cherry picked from commit fe8dac7989)
 2021-10-25 12:49:57 -07:00
Qing Tao 06d5711db8 ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface (#4739) 
* ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface
Introduced new PassSystemInterface::ForEachPass() funtion to replace PassSystemInterface::FindPasses(), PassSystemInterface::GetPassesByTemplateName and ParentPass::FindPassByNameRecursive() functions.
Update all the places which were using those three functions.
The new pass finding filter support any combination of pass name, pass template name, pass class type, pass hirechary, owner scene, owner render pipeline.
Update unit tests.

Signed-off-by: Qing Tao <qingtao@amazon.com>
(cherry picked from commit fe8dac7989)
 2021-10-25 10:37:00 -07:00
santorac c05b900b55 Merge branch 'development' into Atom/santorac/MoveDoubleSided 2021-10-25 09:45:39 -07:00
Mike Balfour 91ca986e2a Terrain Macro Material component improvements (#4930) 
* First pass of non-working changes to Terrain Macro Material Component.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Reworked Terrain Macro Material to use properties instead of a material.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed comments.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* PR feedback - disable attributes when no normal map selected

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix linux compile error - unused variables.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-10-25 11:37:32 -05:00
John f98d2e55aa Refactor component mode query. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-25 13:48:36 +01:00
John 99b840652d Add Focus Mode integration tests. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-25 13:40:12 +01:00
AMZN-Igarri e970247fc5 Asset Browser Search View fixes (#4814) 
* Fixed RowCount method.

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

* Fixed Signals

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

* Fixed Delegate case

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

* Fixed issue when displaying branch icons

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

* Fixed AssetBrowser Delegate

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

* Removed optimize flags

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

* AssetBrowsertableModel cleanup

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

* Fixed Typos

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

* Fixed Comment

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

* Added check for rowCount == 0

Signed-off-by: igarri <igarri@amazon.com>
 2021-10-25 10:35:50 +01:00
santorac 9438fbe3b7 Made material property auto-rename procedure apply to Material Component 
Merge pull request #4905 from aws-lumberyard-dev/Atom/santorac/MaterialPropertyRenameInMaterialComponent

This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.

I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.
 2021-10-23 14:14:19 -07:00