Commit Graph

1423 Commits

Author SHA1 Message Date
mbalfour 5ecd1a583f Changed the level loading code to always set the default mission name now. the mission system recently got redcoded, so nothing else was setting this name. 2021-05-07 14:23:01 -05:00
AMZN-mnaumov 1743d9631b Merge pull request #634 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14850
[ATOM-14850] Re-adding 'Create Material' to folder context menu
2021-05-07 12:04:44 -07:00
Nicholas Lawson e6146b6608 A quick fix for Asset Processor automated tests (#644)
These tests broke because RC.EXE is no longer a thing.

A more comprehensive fix and cleanup needs to be performed to
properly remove references to it while still keeping the existing
tests and other things.  This just removes as little as is possible
to avoid error.
2021-05-07 11:39:07 -07:00
AMZN-stankowi e22debec54 ATOM-15465: Helios rollback AssImp SDK version, this fixes the rotation bug (#608) (#641)
ATOM-15465: Fix issue with incorrect rotation on models.

* Revert "{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545)"

This reverts commit 06d2050ac4fe6b9d0d0c52e759cf73a9a3f7d3eb.

* bumping version to force assets to reprocess
2021-05-07 10:37:29 -07:00
Scott Romero d3e1d70006 [main] new windows offline installer implementation
Merge pull request #630 from aws-lumberyard-dev/cpack_installer
2021-05-07 10:22:35 -07:00
mrieggeramzn 4d56debe0f Merge pull request #632 from aws-lumberyard-dev/Atom/mriegger/heatmap
Atom/mriegger/heatmap
2021-05-07 09:43:53 -07:00
Tom Hulton-Harrop c5a06b8953 Restore grid and angle snapping (#640)
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
Steve Pham 2633efbd13 Moving SystemUtilsApple.mm and SystemUtilsApple.h from CrySystem to AzFramework to fix linker error when building iOS non-monolithically (#631) 2021-05-07 07:34:35 -07:00
jackalbe 347073cbcd {LYN-2257} Helios - Add Matrix math type for JSON Serialization system (#561)
* {LYN-2257} Helios - Add Matrix math type to the JSON Serialization system

* Helios/Systems - Add Matrix math type to the JSON Serialization system
* supports both YPR+scale+translation and array of values
* supports Matrix3x3, Matrix3x4, Matrix4x4

Jira: https://jira.agscollab.com/browse/LYN-2257
Tests: Added Serialization/Json/MathMatrixSerializerTests.cpp

* clang compile fixes

* removed typename

* fixing both tests and some default conformity impls

* stablized the comformity test values; rotations drift too much
2021-05-07 09:31:48 -05:00
amzn-sean cb4e394784 Remove physics world body notification bus (#576) 2021-05-07 14:12:07 +01:00
amzn-sean cb44a7ebb2 first pass at moving physx debug from gEnv->pRenderer to DebugDisplayRequestBus (#600) 2021-05-07 14:10:28 +01:00
amzn-sean cb5cedd7fe Merge pull request #639 from aws-lumberyard-dev/physx_fixpytests
fixing physics periodic automation tests that fail
2021-05-07 12:14:03 +01:00
Aaron Ruiz Mora 0c7be7ceff Reenable NvCloth atom automated tests in AutomatedTesting project
- Added NvCloth gem to AutomatedTesting project.
- Fixed cloth test levels using atom components.
- Updated and enabled cloth tests. They are marked as xfail for now until they properly work with atom null renderer.
- Fixed crash when runnnig editor with null renderer on a level with Actor component.
- Improved chicken asset and slice used in NvCloth gem.
2021-05-07 11:31:34 +01:00
Benjamin Jillich 5e65c5c710 [LYN-2515] Project Manager Gem List Base (#603)
* [LYN-2515] Project Manager Gem List Base

* Added gem model based on a standard item model
* Added list view using the gem model
* Added item delegate for a gem according to the UX design
* Removed th gem catalog ui file and replaced it with code
* Moved the gem catalog files into a sub folder
2021-05-07 12:05:33 +02:00
amzn-sean 15787293bf fixing physics pytests that fail 2021-05-07 11:02:06 +01:00
dmcdiarmid-ly 8afb35cb10 Merge pull request #633 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15063
[ATOM-15063] Toggling visibility on a reflection probe does not disable rendering
2021-05-06 20:54:56 -07:00
mnaumov ff75a39526 Restoring 'Create New Material' to folder context menu 2021-05-06 20:02:10 -07:00
dmcdiar 4cf9af6c06 Released probe handle when deactivating the controller 2021-05-06 19:47:35 -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
mriegger a2ce67a0e7 remove tabs2 2021-05-06 18:10:15 -07:00
mriegger f22a67f8cc remove tabs 2021-05-06 18:09:12 -07:00
mriegger e3cca11ed3 Fix for heatmap not disabling 2021-05-06 18:01:28 -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
scottr 6148137247 Merge branch 'main' into cpack_installer 2021-05-06 17:26:40 -07:00
scottr ff437aadf1 [cpack_installer] windows installer product GUID handling 2021-05-06 17:24:57 -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
scottr efe6d24d51 [cpack_installer] new windows installer basic implementation 2021-05-06 15:51:20 -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