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

8248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
John c2105b0631 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-26 15:30:08 +01: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
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
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
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
santorac a892181432 Minor updates in response to code review feedback. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-23 00:02:31 -07:00
AMZN-Phil 0d5482495f Merge pull request #4932 from aws-lumberyard-dev/Prism/ShowRepoGems 
Show Undownloaded Gems from Repos in Gem Catalog
 2021-10-22 19:39:39 -07:00
AMZN-Phil 657106d66a Merge pull request #4931 from aws-lumberyard-dev/FixInstallerDesktopShortcut 
Fix desktop shortcuts created by Windows installer
 2021-10-22 18:11:29 -07:00
Junbo Liang 71d23cc602 Read engine version from setting registry (#4926) 
* Read engine version from setting registry

Signed-off-by: Junbo Liang <junbo@amazon.com>
 2021-10-22 18:00:43 -07:00
nggieber 182a7b98b7 Always convert gem_path to pathlib.Path and check it isFile() in case it is a str 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:33:30 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:19:54 -07:00
AMZN-Phil f8990ac577 Merge remote-tracking branch 'upstream/development' into FixInstallerDesktopShortcut 2021-10-22 17:08:13 -07:00
santorac cef1e200f6 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 16:42:09 -07:00
santorac 3c331e00ff Moved the Material Component property override renaming to EditorMaterialComponent via ApplyAutomaticPropertyUpdates. 
MaterialAssignment::ApplyProperties() still reports warnings but does not update the m_propertyOverrides.
MaterialAssignment::ApplyProperties() will now skip the old name'd overrides if overrides are present for the new names. I'm not sure if this will ever happen, but it did happen while I had some intermediate changes, so I imagine it could happen again.
I had to update the Material::FindPropertyIndex function to expose information about renames when they occur. This should make it easier for other systems to get (somewhat) automatic benefit from the version update feature.
I also found that there was an issue with material inspector where it wouldn't be initialized the the right override values when renames were present. Now it applies the renames to whatever override data it gets from the Material Component.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-22 16:41:44 -07:00
nggieber 78e556e5ff Changed gem_list to gem_set 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:36:34 -07:00
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:30:02 -07:00
antonmic 297f40d6c4 Merge pull request #4928 from aws-lumberyard-dev/antonmic/buildfix 
buildfix: adding .aszl to shader references
 2021-10-22 16:28:57 -07:00
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:23:17 -07:00
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:22:16 -07:00
AMZN-Phil 04033b088a Fix desktop shortcuts created by Windows installer 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-22 16:12:18 -07:00
AMZN-Phil 69771ab2e1 Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress 
Project Manager track progress of, and cancel downloads
 2021-10-22 15:53:29 -07:00
antonmic 45701a9972 buildfix: adding .aszl to shader references 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-10-22 14:48:15 -07:00
Sean Sweeney 45b164e722 Merge pull request #4881 from aws-lumberyard-dev/lytt_update_defaults 
Lytt update defaults
 2021-10-22 14:27:56 -07:00
AMZN-Phil e1b46b7e5c Add comment about additional callback function and be explicit on return value. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-22 14:23:55 -07:00
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-22 14:07:32 -07:00
antonmic 6bd1b3980c Merge pull request #4865 from aws-lumberyard-dev/Atom/antonmic/DepthOfField01 
Atom/antonmic/depth of field01
 2021-10-22 13:41:36 -07:00
Danilo Aimini a4e0d69e83 Update Splashscreen and About Us dialogs for General Availability (#4901) 
* Add new image for splashscreen. Layout changes incoming.

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

* Adapt layouts to new splashscreen style with transparent background.

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

* Ensure cropping logic works correctly when screen scaling is used.

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

* Remove old image. Replace new image with new version with more readable credits.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-22 12:46:06 -07:00
santorac a27738317b Merge pull request #4918 from aws-lumberyard-dev/Atom/santorac/RequireAzslExtensionInShaderFile 
The .shader file must now include the .azsl extension when referencing a .azsl file
 2021-10-22 12:45:04 -07:00
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 2021-10-22 12:41:09 -07:00
nggieber 10c0522dcb Added F5 support for refreshing repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 12:41:00 -07:00
Chris Galvan efbf2f224e Merge pull request #4913 from aws-lumberyard-dev/cgalvan/AddFindComponentsByServiceAPI 
Added API for finding components based on required/incompatible services
 2021-10-22 14:38:21 -05:00
Danilo Aimini 45926d0dbd LYN-7539 + LYN-7541 | Focus Mode - Show prefab names and dirty markers instead of instance names in breadcrumbs (#4850) 
* Change Prefab Focus breadcrumb widget to display template filename instead of instance container entity name. Also display dirty state for the template (*) and refresh it in real time.

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

* Streamline path creation code; fix stem retrieval to ensure extension is cut correctly; delay refresh one frame when path is clicked to correctly refresh it.

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

* Remove test code.

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

* Simplify code to use Native directly.

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

* Minor variable renaming and comment adjustments to make them clearer.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-22 12:37:43 -07:00
Mike Balfour 243532c5de Addressed feedback from PR 4874. (#4915) 
* Addressed feedback from PR 4874.
* Removed second copy of HeightfieldProviderBus.h from cmake file
* Changed CookedMeshShapeConfiguration and HeightfieldShapeConfiguration to have less messy implementations, instead opting for the slightly less messy const_cast inside of Utils.cpp and DebugDraw.cpp.
* Changed InitHeightfieldShapeConfiguraiton to CreateHeightfieldShapeConfiguration with a better API signature.

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

* Fixed indentation

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-10-22 14:33:36 -05:00