karlberg
d2df379fa4
Fixes for AR issues
2021-05-07 11:26:59 -07:00
karlberg
e8917e0f06
Fix for format string type mismatch
2021-05-07 10:36:34 -07:00
karlberg
a8fa7a59d4
CR feedback
2021-05-07 10:03:07 -07:00
karlberg
05a39a4412
Fix several build failures
2021-05-07 09:54:49 -07:00
karlberg
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
karlberg
b2b632aede
Bug fixes for stats and for sending rpc and property updates from the client
2021-05-06 19:39:31 -07:00
sourjon
cd0628f513
Merge pull request #565 from aws-lumberyard-dev/Prefab/PhysX/ColliderFixes
...
Prefab/physx/collider fixes - Addresses collider crashes on starting in game mode
2021-05-06 19:07:58 -07:00
AMZN-mnaumov
5703d1e1f0
Merge pull request #625 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15291
...
[ATOM-15291] Better AP error message when missing image present
2021-05-06 17:59:57 -07:00
Danilo Aimini
1af6c42e38
Merge pull request #628 from aws-lumberyard-dev/LYN-3636
...
LYN-3636 | Cherrypick to main - Creating a child entity causes an Editor crash in Slice mode
2021-05-06 17:56:32 -07:00
AMZN-mnaumov
5fb923738e
Merge pull request #614 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15474
...
[ATOM-15474] Material Editor camera controller zoom respects viewport boundary
2021-05-06 17:45:47 -07:00
karlberg
4b1fe9b10b
Fix a comment and minor optimization to the server to client replication window
2021-05-06 17:35:48 -07:00
karlberg
e7f0bc9ee2
Local prediction player controller is now functional
2021-05-06 17:23:03 -07:00
jonbeer
8947abcbb7
PR fixes and recommendations
2021-05-06 16:35:01 -07:00
daimini
62a84459ee
Fix to begin/end pair that was missed when porting a change from Prefab Outliner to Slice Outliner.
2021-05-06 16:26:24 -07:00
mnaumov
550d935b82
Better AP error message when missing image present
2021-05-06 15:48:39 -07:00
jckand-amzn
7d1eedc8c4
Merge pull request #616 from aws-lumberyard-dev/jckand/FoundationAuto
...
Marking AssetPicker test as xfail due to ATOM-15493
2021-05-06 17:42:36 -05:00
Chris Santora
9ec968e7e7
Merge pull request #524 from aws-lumberyard-dev/Atom/santorac/PomHeightOffset-ATOM-14495
...
ATOM-14495 "POM Height Bias"
- Added parallax "Height Offset" properties to StandardPBR and EnhancedPBR. (StandardMultilayerPBR coming soon).
- Refactored depth pass and shadow pass shaders to use the GetParallaxInput utility.
- Updated EnhancedPBR.materialtype to match the parallax controls and functors of StandardPBR.materialtype.
- Updated EnhancedPBR's shadow pass shader to apply a ShadowMapDepthBias because I noticed StandardPBR is doing this, so I made them match.
- Updated StandardPBR, EnhancedPBR, and StandardMultilayerPBR (for each individual layer) to use the depth offset property, as well as heightmap clipping debug view.
ATOM-15434 "Decal + POM (Grey outline issue)"
ATOM-15034 "Remove Opacity From Multi-Layer Material Types For Now"
- Made sure the depth and shadow shaders enable parallax calculations when alpha clipping is enabled (instead of only when parallax POM is enabled).
- Moved the alpha calculations to be *after* the parallax calculations.
- Factored out ShouldHandleParallax() and ShouldHandleParallaxInDepthShaders() utility functions, which help us ensure consistent application of parallax calculations across the various shaders in each material type.
- Removed some dead code in a couple shaders where dirToCamera was calculated but not used.
- Removed opacity support from StandardMultilayerPBR rather than addressing whatever additional alpha cutout issues might be present on multilayer materials (we had planned to do this anyway).
Upcoming changes will include...
- Rename a lot of the "depth" terms to "heightmap" or "displacement".
Testing:
- AtomSampleViewer full test suite.
- Added a new AtomSampleViewer screenshot test for alpha clipping with parallax (separate repo).
- Addional testing of relevant properties in Matirial Editor.
- Tested updated StandardMultilayerPBR in Editor.exe where I had shadows and clipping against other geometry.
Corresponding ASV changes: https://github.com/aws-lumberyard/o3de-atom-sampleviewer/pull/44
2021-05-06 15:17:53 -07:00
jonbeer
bf38935e85
Updating conformity tests
2021-05-06 14:49:44 -07:00
jonbeer
3751493862
Fixing ATOM RPI issue with new serialization changes
2021-05-06 14:44:19 -07:00
Brian Herrera
854a1fa201
Merge pull request #604 from aws-lumberyard-dev/build-strike/SPEC-6668
...
[SPEC-6668] Fix email notifications and limit to watched branches
2021-05-06 14:23:07 -07:00
cgalvan
6d338137a9
Merge pull request #609 from aws-lumberyard-dev/cgalvan/FixLCPreferredComponents
...
[LYN-3613] Fixed preferred category for Landscape Canvas when adding components since legacy components have been removed and now Mesh is in the Atom category.
2021-05-06 16:22:31 -05:00
jckand-amzn
1a90528e6c
Marking AssetPicker test as xfail due to ATOM-15493
2021-05-06 16:18:22 -05:00
Chris Santora
778594a357
Merge branch 'main' into Atom/santorac/PomHeightOffset-ATOM-14495
2021-05-06 13:53:58 -07:00
mnaumov
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
2021-05-06 13:10:55 -07:00
Mike Balfour
1ea550690a
Merge pull request #611 from aws-lumberyard-dev/mbalfour/missing-font-fix
...
Moved null check before setting the status to "initializing".
2021-05-06 15:07:09 -05:00
mbalfour
066a1eddf5
Moved null check before setting the status to "initializing". Otherwise, if the first call to InitFont() is with a null render scene, the status will get stuck in initializing forever and fonts will never render. This does NOT fix the text being drawn in the wrong location, that's a separate bug.
2021-05-06 13:42:52 -05:00
Chris Galvan
6aaec0504b
[LYN-3613] Fixed preferred category for Landscape Canvas when adding components since legacy components have been removed and now Mesh is in the Atom category.
2021-05-06 13:35:00 -05:00
Guthrie Adams
261067cfdf
Merge pull request #605 from aws-lumberyard-dev/Atom/guthadam/LYN-3612
...
LYN-3612 Removing reference to redcoded decal component causing drag/drop crash
2021-05-06 13:20:43 -05:00
Vincent Liu
828284d109
[LYN-3463] Improve error message based on resource mapping manager loading status ( #551 )
2021-05-06 10:55:07 -07:00
Brian Herrera
618a02ff13
Update step to also send email to build requestor on all branches
2021-05-06 10:43:44 -07:00
chiyenteng
ede1889507
[CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode ( #585 )
...
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490 )
2021-05-06 10:39:43 -07:00
Luis Sempé
743d4489d5
Merge pull request #593 from aws-lumberyard-dev/carlitosan-beta-fixes
...
Expose raw BC properties to the NodePalette
2021-05-06 10:31:30 -07:00
guthadam
d551d01bed
LYN-3612 Removing reference to redcoded decal component causing drag/drop crash
...
https://jira.agscollab.com/browse/LYN-3612
2021-05-06 12:02:17 -05:00
cgalvan
13a40aba02
Merge pull request #602 from aws-lumberyard-dev/cgalvan/FixedEmptyFloatingWindow
...
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
2021-05-06 11:46:51 -05:00
greerdv
a07d69105b
Merge pull request #416 from aws-lumberyard-dev/non-uniform-scale-decal
...
Non uniform scale decal
2021-05-06 17:39:11 +01:00
chcurran
fc95af4d58
Merge branch 'main' into carlitosan-beta-fixes
2021-05-06 09:38:36 -07:00
Brian Herrera
bdfee639d9
Update formatting
2021-05-06 09:38:31 -07:00
Brian Herrera
032500ddb9
Fix email notifications and limit to watched branches
2021-05-06 09:23:12 -07:00
Benjamin Jillich
32b1d52341
[LYN-2515] Added shared gem info class ( #574 )
2021-05-06 18:01:13 +02:00
Guthrie Adams
c2c6d79688
Merge pull request #592 from aws-lumberyard-dev/Atom/guthadam/ATOM-15473
...
ATOM-15473 added context menu to material inspector group header with expand and collapse actions
2021-05-06 10:53:55 -05:00
Chris Galvan
7dec09d9ae
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
2021-05-06 10:40:24 -05:00
jonbeer
e1c98d1468
Merge branch 'Prefab/PhysX/ColliderFixes' of https://github.com/aws-lumberyard-dev/o3de into Prefab/PhysX/ColliderFixes
2021-05-06 08:17:23 -07:00
jonbeer
52d2998a06
Removing physics test and aztoolsframework dependency
2021-05-06 08:14:41 -07:00
greerdv
578cd47a0a
replacing virtual function with default parameter with overloaded function
2021-05-06 15:11:11 +01:00
hnusrath
785e22541a
Merge pull request #580 from aws-lumberyard-dev/PhysxTimeout
...
LYN-3465 : The test timeout for AutomatedTesting::PhysicsTests_Sandbox
2021-05-06 14:51:42 +01:00
Aaron Ruiz Mora
f258802377
(cherry-pick from 1.0) Fix registry colliding by using a different extension for the files used to override registry
2021-05-06 11:39:19 +01:00
greerdv
368bf69ae6
Merge branch 'main' into non-uniform-scale-decal
2021-05-06 09:01:17 +01:00
balibhan
499152d23c
Merge pull request #542 from aws-lumberyard-dev/SC_migration_branch
...
Script canvas automation scripts migration
2021-05-06 11:41:06 +05:30
moudgils
57ed4095c4
Merge pull request #597 from aws-lumberyard-dev/AddBuildersToMac
...
Add Vulkan and DX12 builders for Mac/Automatedtesting
2021-05-05 23:09:29 -07:00
guthadam
c8b0a7be8a
Merge branch 'main' into Atom/guthadam/ATOM-15473
2021-05-05 23:32:30 -05:00