a40700be2b
Merge commit '49da85ca3a4acb633d9c63abcd43f485905aeb92' into mbalfour/gitflow_211102_o3de
2021-11-02 09:38:40 -05:00
bad4c1a276
Merge commit '8f56dc10c33ae73acaa99c8690e8bc91a1cec2bc' into mbalfour/gitflow_211102_o3de
2021-11-02 09:38:30 -05:00
122a28c4b4
Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de
2021-11-02 09:38:09 -05:00
9589bc050d
Merge commit 'd3ff91f15346328e82e4e4fb293256ff3b026b1c' into mbalfour/gitflow_211102_o3de
2021-11-02 09:38:04 -05:00
402d4d664f
Merge commit 'cf767fd4bd038e39512a0f193dfd7cb536a9700f' into mbalfour/gitflow_211102_o3de
2021-11-02 09:37:59 -05:00
a7f364a5d6
Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de
2021-11-02 09:37:43 -05:00
5867ab6bde
Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de
2021-11-02 09:37:12 -05:00
49da85ca3a
Fix new project path when enabling gem ( #5173 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-01 16:07:57 -07:00
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
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
8f56dc10c3
Perform sse float comparisons with the floating-point intrinsics ( #5115 )
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-01 16:11:34 -04:00
d948d78b2e
Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix
...
Cherry-pick: resolve entity ordering for EntityOutliner
2021-11-01 12:41:58 -07:00
9886603f99
Bug Fix: resolve entity ordering for EntityOutliner ( #4798 ) ( #4938 )
...
* bugifx: resolve dragging behaviour for EntityOutliner (#4798 )
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: cleanup and rework logic
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-11-01 10:35:32 -07:00
7ba7928559
Removing redundant registration of script assets
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-01 11:19:08 -05:00
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
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
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
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
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
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
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
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
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
2a32d67830
Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:53 -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
8dca689444
Merge commit 'caf247fcab0fc65773c6a95f1bbcfe10b184c5e0' into barlev/gitflow_211028_O3DE
2021-10-28 20:06:25 -04:00
8119fe4d86
Merge commit '8d7eb4767afff80992bebe4619afc10aef04a93b' into barlev/gitflow_211028_O3DE
2021-10-28 19:17:33 -04:00
b2a8e40569
Merge pull request #5100 from aws-lumberyard-dev/cgalvan/GemplateImprovements
...
Improvements to C++/Python tool gemplates
2021-10-28 17:20:07 -05: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
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
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
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
e56396a817
Improvements to C++/Python tool gemplates
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-10-28 14:30:14 -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
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
8117798949
Removed gem repo enable button
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-10-28 07:00:21 -07:00
9b2afbc39b
fix explicit qualification of member function addresses
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-10-28 12:51:33 +01:00
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
1435d8b096
Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_211027_o3de
2021-10-27 14:18:01 -07:00
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
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
Mike Balfour
Alex Peterson
Vincent Liu
amzn-mike
Chris Burel
Danilo Aimini
Michael Pollind
Guthrie Adams
Esteban Papp
Artur K
AMZN-Igarri
hultonha
AMZN-AlexOteiza
ffarahmand-DPS
Adi Bar-Lev
Chris Galvan
Tommy Walton
lumberyard-employee-dm
nggieber
greerdv
srikappa-amzn