Commit Graph

8410 Commits (2a32d6783077417bb491cd05dfd99ed2fd090cf1)
 

Author SHA1 Message Date
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 954ec82859 Merge commit '86270339d8967de8c983cd4ab96982f347652d0f' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev f25b80e172 Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev cd3891fe23 Merge commit '689f5b2a4ac376634439708637346e5a3157f085' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 8dca689444 Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev d64b9d4945 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE
Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com>
5 years ago
Adi Bar-Lev 8119fe4d86 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 0ee7ab9df5 Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 759b75a477 Merge commit 'caab78d9300762b283cf60856753fd090367e193' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev c26ce47805 Merge commit '59c898fc4853f898fc01ff6145a71bebad3caac6' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev ca9c7da168 Merge commit 'd23df465dd34d961bdbc5a73b7989abdb301ea47' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev fcd5e1e5fa Merge commit '35467b63d9964f8c308c7a4c07b9373181c48b6c' into barlev/gitflow_211028_O3DE 5 years ago
Adi Bar-Lev 8184c526f7 Merge commit '9e0756f3c11ae5218246fec732e1ceb4da14caeb' into barlev/gitflow_211028_O3DE 5 years ago
amzn-mike 899bda4631
Add additional logging for Fingerprint test. (#5104)
This logging is to help track down a Jenkins only automated test failure.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
Guthrie Adams 7d1b20d480
Merge pull request #5057 from aws-lumberyard-dev/Atom/guthadam/material_instance_editor_indicator_changes
Material component property inspector indicator changes
5 years ago
Allen Jackson 29f5fb1271
{lyn7352} adding more logging around mock_asset_builder.py (#5103)
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
5 years ago
Alex Peterson 6cce184340
Enforce unique gem names in catalog (#5063)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
5 years ago
Mike Balfour 86270339d8
Added terrain surface data notifications (#5067)
* Fix notifications for surface data changes.
Separated the notifications from the surface component and the height component to add a reason to a RefreshArea request.  This makes it possible to distinguish between surface changes and height changes and provide the appropriate OnTerrainDataChanged flags.

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

* Reworked to use a changeMask instead of separate calls.

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

* PR Feedback
Judicious use of "using" to reduce a bunch of bulky namespaces.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
5 years ago
Shirang Jia b8ced0d461
Fix AP log path on S3 (#5068)
Signed-off-by: shiranj <shiranj@amazon.com>
5 years ago
Alex Peterson 00a49fa251
Use source model data instead of filtered (#5071)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
5 years ago
Tommy Walton f350ba3042
Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project (#5072)
* Modify the AssetBundler to correctly identify the Gems that are enabled in the current active project

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Removed unnecessary if() statement and updated the comment.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Disabling gem loading in the asset bundler tests, just like the asset bundler itself.

Signed-off-by: Tommy Walton <waltont@amazon.com>
5 years ago
Guthrie Adams 689f5b2a4a
Merge pull request #5076 from aws-lumberyard-dev/Atom/guthadam/material_component_supports_scripting_enums
Fix issue setting enum values on material component from script
5 years ago
Guthrie Adams caf247fcab
Merge pull request #5070 from aws-lumberyard-dev/Atom/guthadam/material_component_clear_default_material_fixes
Fix clearing material component default material not updating
5 years ago
amzn-mike b6d634c3ed
Print all captured messages in Assert Absorber used by FingerprintTest to help debug crash (#5096)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
Guthrie Adams e5729fbefe Fix clearing material component default material not clearing materials or updating preview
• Changed thumbnail property control to track asset key even if image is overridden so that it will be restored if the image is cleared.
• Changed property asset control to disable the thumbnail image by default whenever the attribute is applied. It will only enable the thumbnail image if the pixmap is valid.
• Changed the material component controller to always use an empty material assignment map on deactivation so that no persistent materials are reapplied.
• Changed the material component controller to immediately send a notification that materials have updated if no materials were queued for load but the configuration contained pre created or persistent material instances. This mainly affects the material editor because it manages its own material instances.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
Guthrie Adams 5de24437ab fixed comment
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
Guthrie Adams 1f4967b168 extending conversions from script to other numeric types
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
Guthrie Adams b71e307de5 Fix issue setting enum values on material component from script
Replaced get and set functions with explicit types with templates
Added special case handling for setting enum values as strings or numbers from script

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
lumberyard-employee-dm b9147c60a0
Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)
* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
John Jones-Steele e288ae47b4
Fix for using too large values on Terrain World (#5091)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
Tommy Walton 67f90a9b37
Add missing dependencies to pass builder (#4884)
* Adding shaders and attimage files as runtime depenencies for pass files, so that they are included in asset bundles. Also using the correct job key for attimage files.

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Use a reference to avoid a copy

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Bumping the AnyAsset builder version

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Revert "Bumping the AnyAsset builder version"

This reverts commit 778798ae9cdd93ebe93248b3113e4cfb7609020d.

Signed-off-by: Tommy Walton <waltont@amazon.com>
5 years ago
Ken Pruiksma a661189ea9
Fix for rendering artifacts on height map update. (#5066)
* Fix for rendering artifacts on height map update. This was being caused by not always lining up update aabbs with the query resolution correctly. In the future the float -> integer aabb calculations should be abstracted away. Some of this is done in the detail material ID work, but doesn't exist in the stabilization branch so we can circle around to it later.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* PR review updates - fixing cast, making constexpr for bytes per pixel.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
5 years ago
greerdv 8d7eb4767a
Merge pull request #5081 from aws-lumberyard-dev/ragdoll-joint-rotation
make sure joint frame rotations are editable for ragdoll setup
5 years ago
Olex Lozitskiy 837831a919
Bug fix: hierarchical components serve as multiplayer input drivers
- Network Hierarchy Root and Child components can now act as MultiplayerInputDriver for components with NetworkInputs
5 years ago
greerdv 9b2afbc39b fix explicit qualification of member function addresses
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
Chris Galvan caab78d930
Merge pull request #5065 from aws-lumberyard-dev/cgalvan/RenameToolGemTemplates
Renamed the C++ and Python tool gem templates
5 years ago
Danilo Aimini e4df621f88
Merge pull request #5052 from aws-lumberyard-dev/daimini/gitflow_211027_o3de
GitFlow 10/27/21 (stabilization2110 to development) - O3DE
5 years ago
jromnoa 568d9a3f36
Merge pull request #5069 from aws-lumberyard-dev/Neil_o3de_local
Adding the Hydra P0 Grid component test, and including it in the Test…
5 years ago
Neil Widmaier 308fcd8bf2 Adding the Hydra P0 Grid component test, and including it in the Test_Suite_Main_Optomized.
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
5 years ago
Jeremy Ong 13a136fa05
Merge pull request #5038 from aws-lumberyard-dev/Atom/jiaweig/ATOM-16414_vulkan_stencil
ATOM-16414 Vulkan stencil reference bits are used incorrectly
5 years ago
Danilo Aimini 1435d8b096 Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de 5 years ago
Chris Galvan 8bbd8f9807 Renamed the C++ and Python tool gem templates after review.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Alex Peterson 59c898fc48
Fix notification queue and add gem action (#4985) (#5024)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
5 years ago
srikappa-amzn 6f8890c2ef
Improve error messaging when duplicating entities before they are created (#4922)
* Improved error messaging when user tries to duplicate before entities are created

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
5 years ago
Guthrie Adams 5ceb9ee214 Material component property inspector indicator changes
Shows indicator icon for differences between the overrides and the active material asset, not the material type.
So, the indicator will only be shown for property changes that have an effect and will be stored in the component.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
Chris Galvan d23df465dd
Merge pull request #5043 from aws-lumberyard-dev/cgalvan/CherryPickPythonGemTemplate
Cherry picked PythonGem template to stabilization.
5 years ago
John Jones-Steele 35467b63d9
Unit tests for Heightfield collider (#5042)
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
Qing Tao 9e0756f3c1
ATOM-16656 PassTree tool: ParentPass image attachment preview doesn't work (#5032)
Move imageAttachmentCopy instance from RenderPass to Pass so it can support preview image for all passes but not only for RenderPass.
Fixed an issue with image attachment preview when switching render pipeline with attachment preview on.

Signed-off-by: Qing Tao <qingtao@amazon.com>
5 years ago