ea4bc31b38
Merge pull request #4675 from aws-lumberyard-dev/editor_test_tools_cleanup
...
Editor test tools cleanup
2021-10-29 15:47:26 -07:00
e871dff70e
Added two complex prefab tests ( #5089 )
...
* Added two complex prefab tests
* Fix compile error
* Added extra methods, fixed test failure
* Addressed PR commments
* More PR comments
* Fix space
* Fix ar error
2021-10-29 22:32:33 +01:00
de4658b16c
Corrects mistake naming the override commands ( #5140 )
...
* corrects mistake naming the override commands
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* fixes PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-29 14:25:13 -07:00
0807cb7f3e
Added "RemovePassTemplate" method. ( #5039 )
...
* Added "RemovePassTemplate" method.
Signed-off-by: garrieta <garrieta@amazon.com >
* RemovePassTemplate only allows to remove PassTemplates
created with the Runtime API. It now asserts if there are Passes
referencing the PassTemplate that should be removed.
Signed-off-by: garrieta <garrieta@amazon.com >
2021-10-29 15:41:17 -05:00
07353ed4ad
Merge pull request #5137 from aws-lumberyard-dev/Prism/integrate-crash-fix
...
Integrate gem catalog refresh crash fix (#5112 )
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-29 12:03:34 -07:00
971e24285f
Fixes debug console's "quit" issues ( #4975 )
...
* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. The change simply ensures that the underlying font data the OnRenderTick() function relies on has not yet been released from memory.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com >
* Fixes a crash caused when attempting to ‘quit’ the launcher from the debug console. An object created on the heap was never deleted, causing a chain reaction.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com >
* Some quick clean-up for safety.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com >
* Changes !defined(DEDICATED_SERVER) to a runtime check since macro is no longer defined.
Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com >
2021-10-29 11:28:42 -07:00
72d6f2972e
Adding support for multi-config/multi-permutation installer
2021-10-29 10:46:28 -07:00
7b5a5b8f74
Merge pull request #5106 from aws-lumberyard-dev/Atom/scottm/cleanup_import
...
Test parallel PostFX Layer remove and unused import
2021-10-29 10:35:40 -07:00
ca9093c202
Add engine name, folder and fix refresh crash ( #5112 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-29 10:19:33 -07:00
66612cac28
Merge pull request #5116 from aws-lumberyard-dev/barlev/gitflow_211028_O3DE
...
Barlev/gitflow 211028 O3DE
2021-10-29 10:00:14 -04:00
f40191dd8c
bugfix: resolve broken focus for viewport ( #5059 )
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-10-29 10:15:22 +01:00
a322d9e2b8
Small Code/Editor cleanup pass ( #4909 )
...
* Clean-up in ConfigGroup
Removed unused templated AddVar and related code.
Replaced legacy types with `AZ::` ones.
Cleaned up cpp file.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Add a few missing Q_OBJECT macros, remove some unused variables.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply some of clazy suggestions + simplifications
* removed `emit` from non-signal function calls.
* replaced `QStringLiteral("")` with a constexpr friendly
`QLatin1String()`
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix a CNewLevelDialog focus bug
Fixed an incorrect QTimer::singleShot invocation.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* match lambda to `messageChanged` signature
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* vs compilation fix + applied review
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* apply reviewer recommendation
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-10-29 09:59:18 +01:00
37381489ee
EMotion FX: Actor component: Skeleton rendering is not working ( #5084 )
...
Enabling the "Draw skeleton" checkbox in the actor component does not show the skeleton.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-10-29 09:12:27 +02:00
4e2de0170c
reverting typehints
...
Signed-off-by: evanchia <evanchia@amazon.com >
2021-10-28 19:33:59 -07:00
475338cfad
Merge branch 'development' into o3de_sdk/installer_configs
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-28 18:29:52 -07:00
60e14d3a4c
Fixes PR comments
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-28 18:17:26 -07:00
4dcd60ba08
testing changes to fix Jenkins
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-28 17:49:31 -07:00
ecf70daca8
does this space affects?
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-28 17:44:16 -07:00
2a32d67830
Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:53 -04:00
954ec82859
Merge commit '86270339d8967de8c983cd4ab96982f347652d0f' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:47 -04:00
1488522236
Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:42 -04:00
f25b80e172
Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:36 -04:00
cd3891fe23
Merge commit '689f5b2a4ac376634439708637346e5a3157f085' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:31 -04:00
8dca689444
Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:25 -04:00
d64b9d4945
Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE
...
Signed-off-by: Adi Bar-Lev <82479970+Adi-Amazon@users.noreply.github.com >
2021-10-28 19:52:42 -04:00
8119fe4d86
Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:33 -04:00
0ee7ab9df5
Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:28 -04:00
759b75a477
Merge commit 'caab78d9300762b283cf60856753fd090367e193' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:21 -04:00
c26ce47805
Merge commit '59c898fc4853f898fc01ff6145a71bebad3caac6' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:15 -04:00
ca9c7da168
Merge commit 'd23df465dd34d961bdbc5a73b7989abdb301ea47' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:10 -04:00
fcd5e1e5fa
Merge commit '35467b63d9964f8c308c7a4c07b9373181c48b6c' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:04 -04:00
8184c526f7
Merge commit '9e0756f3c11ae5218246fec732e1ceb4da14caeb' into barlev/gitflow_211028_O3DE
2021-10-28 19:16:57 -04:00
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 >
2021-10-28 17:17:18 -05:00
7d1b20d480
Merge pull request #5057 from aws-lumberyard-dev/Atom/guthadam/material_instance_editor_indicator_changes
...
Material component property inspector indicator changes
2021-10-28 17:06:13 -05:00
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 >
2021-10-28 16:38:27 -05:00
6cce184340
Enforce unique gem names in catalog ( #5063 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-28 14:33:24 -07:00
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 >
2021-10-28 16:17:38 -05:00
7536073df0
remove and unused import
...
Signed-off-by: Scott Murray <scottmur@amazon.com >
2021-10-28 13:36:48 -07:00
b8ced0d461
Fix AP log path on S3 ( #5068 )
...
Signed-off-by: shiranj <shiranj@amazon.com >
2021-10-28 13:31:33 -07:00
00a49fa251
Use source model data instead of filtered ( #5071 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-28 12:53:54 -07:00
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 >
2021-10-28 12:49:33 -07:00
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
2021-10-28 14:41:56 -05:00
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
2021-10-28 14:40:52 -05:00
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 >
2021-10-28 14:37:51 -05:00
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 >
2021-10-28 13:58:47 -05:00
5de24437ab
fixed comment
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-28 13:53:26 -05:00
1f4967b168
extending conversions from script to other numeric types
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-28 13:53:23 -05:00
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 >
2021-10-28 13:53:21 -05:00
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 >
2021-10-28 13:45:19 -05:00
e288ae47b4
Fix for using too large values on Terrain World ( #5091 )
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-10-28 19:36:39 +01:00
Sean Sweeney
AMZN-AlexOteiza
Esteban Papp
galibzon
Alex Peterson
ffarahmand-DPS
jromnoa
Adi Bar-Lev
Michael Pollind
Artur K
Benjamin Jillich
evanchia
amzn-mike
Guthrie Adams
Allen Jackson
Mike Balfour
Scott Murray
Shirang Jia
Tommy Walton
Guthrie Adams
lumberyard-employee-dm
John Jones-Steele