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

3286 Commits

Author SHA1 Message Date
Scott Romero 797b8248e5 [development] Consolidated programmatic profiler capture API (#4969) 
Merged overlapping profiler EBuses/Interfaces into AzCore
Fixed ambiguous LogLevel type in some unity file scenarios
Added cvar/console access for profiler capture
Added utilities for reflecting AZ::Interfaces through the BehaviorContext
Included profiler system sample python script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-11-02 09:00:15 -07:00
Michael Pollind 32bebe1c8c bugifx: resolve crash with project manager (#5151) 
- system allocator not configured in environment for AZQtComponents
- WA_DeleteOnClose will destroy the toast dialog causing a crashing when ToastNotificationsView tries to access the pointer

issue: https://github.com/o3de/o3de/issues/5129
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-02 08:59:19 -07:00
Vincent Liu 96159c1e3a Add missing exclamation mark for documentation (#5144) 
* Add missing exclamation mark for documentation

Signed-off-by: onecent1101 <liug@amazon.com>

* Add more

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-11-01 14:52:40 -07:00
amzn-mike 916fb413c9 Fix Assert Absorber being leaked due to one of the tests setting m_errorAbsorber to nullptr without deleting the object (#5176) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-01 14:19:27 -07:00
AMZN-ScottR 9b39c63bba Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:43:19 -07:00
AMZN-ScottR 9057cfbcbf [profiler_capture_api] fixed release compile error 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-01 11:41:44 -07:00
Esteban Papp 8e420dad3d Removes some usage of DEDICATED_SERVER (#5119) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-01 08:46:26 -07:00
Artur K 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
AMZN-ScottR 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
AMZN-ScottR 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
AMZN-ScottR 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
AMZN-AlexOteiza 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
Alex Peterson 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
ffarahmand-DPS 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
Esteban Papp 72d6f2972e Adding support for multi-config/multi-permutation installer 2021-10-29 10:46:28 -07:00
Alex Peterson 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
Adi Bar-Lev 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
Michael Pollind f40191dd8c bugfix: resolve broken focus for viewport (#5059) 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-10-29 10:15:22 +01:00
Artur K 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
Esteban Papp 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
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:53 -04:00
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:42 -04:00
Adi Bar-Lev f25b80e172 Merge commit 'f350ba3042b216369748935800628118b835ca81' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:36 -04:00
Adi Bar-Lev 8dca689444 Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:25 -04:00
Adi Bar-Lev 8119fe4d86 Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE 2021-10-28 19:17:33 -04:00
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>
 2021-10-28 17:17:18 -05:00
Alex Peterson 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
AMZN-ScottR 90509c7fa2 [profiler_capture_api] removed now unnecessary ProfilerRequests EBus alias after AZ::Interface conversion 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-28 14:18:04 -07:00
Alex Peterson 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
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>
 2021-10-28 12:49:33 -07:00
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>
 2021-10-28 14:37:51 -05:00
AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-28 12:19:50 -07:00
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>
 2021-10-28 13:58:47 -05:00
AMZN-ScottR fc94ede439 [profiler_capture_api] fixed runtime issues with BehaviorInterfaceProxy reflection 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-28 11:55:49 -07:00
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>
 2021-10-28 13:45:19 -05:00
greerdv 9b2afbc39b fix explicit qualification of member function addresses 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:51:33 +01:00
greerdv dd0780f6ec make sure joint frame rotations are editable for ragdoll setup 
Signed-off-by: greerdv <greerdv@amazon.com>
 2021-10-28 12:26:05 +01:00
AMZN-ScottR e7ed2c2a83 [profiler_capture_api] updated ProfilerRequests reflection to be as AZ::Interface 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-27 15:55:02 -07:00
AMZN-ScottR f90074adb6 [profiler_capture_api] added utility for reflecting AZ::Interfaces through the BehaviorContext 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-27 15:54:03 -07:00
Danilo Aimini 1435d8b096 Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de 2021-10-27 14:18:01 -07:00
Alex Peterson 59c898fc48 Fix notification queue and add gem action (#4985) (#5024) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-27 13:55:32 -07:00
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>
 2021-10-27 12:46:06 -07:00
Danilo Aimini d5c09c695c Merge commit '3165cf283828d1234bda738ab24ea74c4511152a' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:23:12 -07:00
Danilo Aimini b9613bc915 Merge commit '7fc0f14a1b4f66e560a2ee770b9dbb28dfd54d6f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:23:07 -07:00
Danilo Aimini 732b8c2d1b Merge commit 'd332f7c4c70343d7e1a8ca72723ac99ebdd30ca6' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:22:58 -07:00
Danilo Aimini 46d616824f Merge commit '856318005cac14560f765dc5af203e0139344bb3' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:22:30 -07:00
Danilo Aimini bc844dc6c9 Merge commit 'a2eca9de3d2e5abca3d5f52f58ff6afd613d8d0d' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:22:00 -07:00
Danilo Aimini 1a65250b96 Merge commit '22a287d046c606ccb79ff19c1c15075d8cd71dbc' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:21:56 -07:00
Danilo Aimini 324c9462b6 Merge commit '6b3fc0ff8b2e3094781d7521ec116f620951d46f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:21:46 -07:00
Danilo Aimini b2ef35caa1 Merge commit 'f3499011ac52f801ab5bf5f27791f56039e0a7d1' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:21:41 -07:00