2dff26ddb5
Fix asset type retrieval in AssetCatalogModel::GetAssetType ( #4995 )
...
* Fix asset type retrieval in AssetCatalogModel::GetAssetType
Previous logic would visit the next entry in m_extensionToAssetType map, if the previous entry had multiple types
was only exiting the inner loop.
The main change is that now the first found matching asset type is returned.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply reviewer's suggestions + reduce allocations.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-11-01 14:51:15 +00:00
db01d8ddda
Fix bug timestamp view 'Once per Second' option ( #5080 )
...
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com >
2021-11-01 14:47:45 +00:00
d3ff91f153
Fixed memory leak of the in the AssetBrowserComponent ( #5132 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-01 12:16:00 +00:00
cf767fd4bd
Fix for 'focus' text appearing incorrectly ( #5133 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-11-01 09:33:38 +00:00
68cb8792f7
fix header comments
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-31 15:12:27 -05:00
c79bf7a0c1
load render option in atom render plugin and use render actor settings in atom debug draw
...
Signed-off-by: rhhong <rhhong@amazon.com >
2021-10-30 22:37:05 -07:00
799290aefc
Created custom JSON serializer for editor material component
...
The editor component contains an editor specific, dynamically generated version of the material slots to display all the possible options, organize properties for the user interface, and add custom actions.
The critical data is already stored inside of the component controller configuration, which only stores a map of modified or overridden values.
This change disables serialization of the redundant data for prefabs.
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-10-30 17:36:07 -05:00
8c0dbe4b33
missed escaping these variables and breaks runtime dependencines in the install layout ( #5149 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-10-30 12:39:40 -07:00
1ec34f6123
Fix typo when calling upload_to_s3.py ( #5139 )
...
Signed-off-by: shiranj <shiranj@amazon.com >
2021-10-29 21:11:53 -07:00
2d7c6af97c
Merge branch 'development' into profiler_capture_api
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-10-29 17:21:29 -07:00
4721f44b92
[profiler_capture_api] more changes based on PR feedback
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-10-29 17:19:38 -07:00
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
22820b6a90
Update snapshots list to stablization/2110
...
Signed-off-by: Mike Chang <changml@amazon.com >
2021-10-29 15:13:20 -07:00
b2e6711196
[profiler_capture_api] fixed clang compile error
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-10-29 14:45:25 -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
2f38873e03
Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-10-29 13:55:32 -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
4ccbb964f3
Add missing dependencies to pass builder ( #4884 ) ( #5099 )
...
* 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 >
2021-10-29 10:53:31 -07:00
72d6f2972e
Adding support for multi-config/multi-permutation installer
2021-10-29 10:46:28 -07:00
8aecd6668a
Merge pull request #5113 from aws-lumberyard-dev/Prism/ReposExceptionFix
...
Fix thrown exceptions if repos does not exist in the manifest
2021-10-29 10:40:46 -07:00
65d23c7ed6
Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo
...
Removed Gem Repo Enable Button
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-29 10:38:11 -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
5db6ffb6f3
Disable custom titlebar on Mac, Linux, fix resize ( #4973 ) ( #5114 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-29 09:21:20 -07:00
b4dd4c8f02
Add engine name, folder and fix refresh crash ( #5112 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-10-29 09:20:52 -07:00
5fe2207892
Merge pull request #5095 from aws-lumberyard-dev/Atom/barlev/Stabilization_MaterialMetalicBugFix
...
Material - enbale/disable metallic scale according to texture selection
2021-10-29 11:12:14 -04: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
021917ad27
Fix bug 4198 ( #5107 )
...
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-10-29 09:42:40 +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
d355942e8b
Fix an additional location
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-10-28 16:36:54 -07:00
8119fe4d86
Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:33 -04:00
5971f1176e
Fix thrown exceptions if repos does not exist in the manifest
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-10-28 16:17:28 -07:00
0ee7ab9df5
Merge commit '837831a91990861220d982ca21a302197178092a' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:28 -04:00
Artur K
Santi Paprika
AMZN-Igarri
hultonha
Guthrie Adams
rhhong
Esteban Papp
Shirang Jia
AMZN-ScottR
Sean Sweeney
Mike Chang
AMZN-AlexOteiza
Gene Walters
galibzon
Alex Peterson
ffarahmand-DPS
Tommy Walton
AMZN-Phil
jromnoa
Adi Bar-Lev
Michael Pollind
John Jones-Steele
Benjamin Jillich
evanchia
AMZN-Phil