564bf0c819
Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:46 -08:00
c82f8e43f4
Merge commit 'bc82afa87ac5da739d2b7938242cbdbe4b55dd31' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:42 -08:00
d614ff17d6
Merge commit '3d84876e87a3c28a420d74c19606d1fbe5c703d3' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:38 -08:00
fa7d7e2ec3
Merge commit 'b3e2c3f075db1f28277c0a35987318449b4eeeb9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:34 -08:00
320ef4cd05
Merge commit '5c0fe6a54f14d1770334679e0457702a37a946c2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:30 -08:00
dc1aa6ee39
Merge commit '533b80095b48857e02f4bfeba5a0ecfd1ad85b16' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:25 -08:00
8887b55fc8
Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-16 12:53:42 -08:00
fc2b5192b8
Merge commit 'f2068397fa4542bd034e9d34002cca4b976c31b1' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:30 -08:00
ade8183473
Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:26 -08:00
14e4fd40d4
Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:22 -08:00
2d34700dc2
Merge commit '4d3c977d5832d9d1d04ea419d3e54314f4412b2e' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:18 -08:00
0dcf49affc
Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-16 11:45:09 -08:00
e44fa2a52a
Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:19 -08:00
21d5e62f85
Merge commit 'cb1a45f9ec01ebaede35da2924bde66f31c31ea2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:15 -08:00
d9eb4fa688
Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:11 -08:00
4e8f18aad4
Merge commit 'b44ce82435b7f737bca73bcf25e553d6c7b23f27' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:07 -08:00
1f64ff039b
Merge commit 'bceadf7597a4af57d37a18c4cb2f81b5e840dbb6' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:03 -08:00
fc61bce3af
Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:59 -08:00
81a2f565c9
Merge commit '2fa3c134e04c89b61b1e47bf0b44bdc74b840866' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:55 -08:00
841c55c831
Merge commit 'b8f7767cd6ca0201cd5ae0a44c37b75d42f22299' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:51 -08:00
5232fe9166
Merge commit 'e4ca568433e3de3bc002176ab2fd6bf380a03c18' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:47 -08:00
72f2d2701f
Merge commit '6ffee4b0a8292b5ad6bb9a35b49655c62b2b5b3b' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:43 -08:00
4ab3bd487f
Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:39 -08:00
6080801c55
Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:35 -08:00
30325a34fe
Merge commit 'e3c3db4ba61b230a69b670e02873c0f4b7766504' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:31 -08:00
783bb72944
Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:26 -08:00
65c3ad6545
Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:22 -08:00
830c10b8b0
Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:18 -08:00
9cf49845a4
Merge pull request #5621 from aws-lumberyard-dev/scripting/expand_context_menu
...
Added user option to define the size of the Script Canvas node palette context menu
2021-11-16 09:19:41 -08:00
84ba4afc54
EMotion FX: Deleting a corresponding anim graph when a Reference node is open crashes the Editor ( #5612 )
...
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-11-16 12:45:02 +01:00
9a72dd7446
Bugfix - Render normal is incomplete when multiple mesh present. ( #5605 )
...
Signed-off-by: rhhong <rhhong@amazon.com >
2021-11-16 00:17:40 -08:00
3791149c6b
Merge pull request #5531 from aws-lumberyard-dev/linux_ar
...
Enable python-based tests in Linux AR
2021-11-15 15:50:58 -08:00
d19ff1e779
Merge pull request #5596 from aws-lumberyard-dev/scripting/text_updates
...
Script Canvas node naming & generation improvements
2021-11-15 14:56:41 -08:00
35b4f6a538
Replaced float with AZ::u32
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 14:46:38 -08:00
4e1045c005
Merge branch 'development' into linux_ar
2021-11-15 13:40:42 -08:00
63713ca284
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context ( #5575 )
...
Also made the unlock conditional.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 12:23:56 -08:00
fc547d902c
Add message to indicate Json serialization of bitset is not supported ( #5590 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-15 14:09:43 -06:00
cffd93642e
Reverted unnecessary change
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 11:48:35 -08:00
ca66c609aa
Added user setting to change the Script Canvas node palette context menu
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 11:43:16 -08:00
0cea59d669
[LYN-7463] Fix insert streaming request failure ( #5604 )
...
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Re-enable disabled test which was failing for the same reason.
Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Instead of using a mutex, re-order the statements to remove the streamer request first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 11:28:06 -08:00
bc82afa87a
Merge pull request #5606 from aws-lumberyard-dev/Atom/guthadam/fixing_double_registration_of_hair_asset
...
Fixing double registration of hair asset
2021-11-15 13:27:31 -06:00
3d84876e87
Merge pull request #5615 from aws-lumberyard-dev/Atom/guthadam/material_editor_taking_focus_when_opening_new_document
...
Bug fix for material editor not taking focus when opening a new docum…
2021-11-15 13:26:57 -06:00
b3e2c3f075
SetComponentProperty is now supported by undo operation ( #5599 )
...
* Adding undo support to SetComponentProperty to make it function with prefab system
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Renaming a variable
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-11-15 11:01:42 -08:00
ed05318059
Fixed fallback name for EBus methods, improved more names
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 10:29:45 -08:00
5c0fe6a54f
Fix for CSM shimmering ( #5607 )
...
* Fix for CSM shimmering
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
* removing debug code
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-11-15 10:16:25 -08:00
533b80095b
Fix for cascade shadow map clipping out too close to the camera ( #5509 )
...
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-11-15 10:16:06 -08:00
9adb968e7a
Fixed EBus generation to pull the BC metadata, and a few text updates
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-15 10:05:59 -08:00
c0192e7543
Remove CPU Spin lock to help conserve power/perf ( #5597 )
...
Signed-off-by: moudgils <moudgils@amazon.com >
2021-11-15 09:56:28 -08:00
c44d03a40d
Asset bundler test fixes ( #5548 )
...
* Cleaning up errors with default assets, used in bundled release builds
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated simple asset references to be to the product, not source assets
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Fixed test_WindowsAndMac_FilesMarkedSkip_FilesAreSkipped to pass again.
Updated the test to verify the assets are actually skipped and not just missing, by having it first run without the skip command and verify they are in the first run. Also updated logging to print out sorted lists, to make it easier to debug failures on Jenkins in the future.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Removed a test marked skip for legacy levels that featured a lot of assets that are no longer valid.
I don't think we need this specific test anymore in the future because prefabs replace the level system, and prefabs should have their own tests for product dependencies.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated project path to use absolute path (#5459 )
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Updated project path to work with latest project path changes
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Changed to workspace.paths.project() for getting full path to projects
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
Co-authored-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 09:10:04 -08:00
d9746647e1
Bug fix for material editor not taking focus when opening a new document from the main editor or outside of the material editor
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-15 10:54:34 -06:00
Tommy Walton
Luis Sempé
Benjamin Jillich
Roman
Sean Sweeney
amzn-mike
amzn-sj
Guthrie Adams
Mikhail Naumov
mrieggeramzn
moudgils
AMZN-stankowi
Guthrie Adams