Commit Graph

2202 Commits

Author SHA1 Message Date
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-21 10:54:44 -05:00
Chris Burel d8bd6ef407 Preserve asset ids for assets that fail to load, when deserializing from json (#847)
Sometimes deserializing a Json document happens when asset handlers are not
registered. In that case, `FindOrCreateAsset` will fail to create the
asset, since there's no handler registered to create it. When this happens,
`FindOrCreateAsset` returns an Asset instance with a null asset id. This
effectively causes the json deserializer to lose that data, even in
situations where the the actual asset data doesn't need to be loaded, but
the asset id needs to be preserved.
2021-05-21 08:39:10 -07:00
Chris Santora 6cd86619ff Merge pull request #860 from aws-lumberyard-dev/Atom/santorac/MaterialInspectorCrash-ATOM-15597
ATOM-15597 Accessing Material Instance Panel Crashes Editor

There were two issues fixed here. First, I broke the material inspector with my changes at 53188a1 which added support for hiding entire property groups. I'm not sure how this happened because I definitely tested the MaterialComponent's material inspector. Perhaps there was a bad merge or something otherwise got clobbered after testing and before committing. Anyway, this issue was I accidentally delete the code that prepared the list of material properties for functor processing.

The second issue was the MaterialFunctor class needs to return null when metadata can't be found; it was proceeding to dereference an end iterator.

Testing:
Successfully opened the material inspector through the MaterialComponent. Was able to change property flags in the inspector and see other properties change visibility as expected.
2021-05-21 08:17:31 -07:00
AMZN-stankowi ead54c85d7 Helios - SPEC-6963 - Fixed unused variables in release builds (#856) 2021-05-21 06:21:26 -07:00
Tom Hulton-Harrop 1e2017d04f Update .clang-format file for clang-format version 11.0 (#849)
* update .clang-format file now clang-format version 11.0 is widely available

* update to braced style lists formatting rules
2021-05-21 13:29:04 +01:00
greerdv 1a4bdcf651 Merge pull request #855 from aws-lumberyard-dev/non-uniform-scale-blast
remove vector scale from Blast in preparation for its removal from Transform
2021-05-21 12:07:55 +01:00
Tom Hulton-Harrop 74a2735766 Add better support for mouse deltas with camera system (#846)
* add better support for mouse deltas with camera system

* small fixes spotted during review

* rename after review feedback

* small refactor to reduce duplication
2021-05-21 10:35:33 +01:00
Chris Santora bffc72794b ATOM-15597 Accessing Material Instance Panel Crashes Editor
There were two issues fixed here. First, I broke the material inspector with my changes at 53188a12da which added support for hiding entire property groups. I'm not sure how this happened because I definitely tested the MaterialComponent's material inspector. Perhaps there was a bad merge or something otherwise got clobbered after testing and before committing. Anyway, this issue was I accidentally delete the code that prepared the list of material properties for functor processing.

The second issue was the MaterialFunctor class needs to return null when metadata can't be found; it was proceeding to dereference an end iterator.

Testing:
Successfully opened the material inspector through the MaterialComponent. Was able to change property flags in the inspector and see other properties change visibility as expected.
2021-05-20 22:24:19 -07:00
kberg-amzn c05c100a72 Merge pull request #834 from aws-lumberyard-dev/MultiplayerComponents
Finishing off rewind and backward reconciliation support as well as a bunch of bug fixes and API cleanup.
2021-05-20 18:48:40 -07:00
lumberyard-employee-dm 8028cbbe39 Fixed issue where the SettingsRegistryImpl::LessThan function would set the collisionFound boolean to true when comparing two elements that happened to be at the same address via std::sort. (#857)
In reality there is no such collision and the comparisons needs to early return with false, but not change the collisionFound flag.
2021-05-20 20:41:30 -05:00
Nicholas Van Sickle 5d162a9a63 Merge pull request #858 from aws-lumberyard-dev/nvsickle/FixAtomFontLoading
Ensure AtomFont loads with the Editor
2021-05-20 18:39:16 -07:00
nvsickle e19f1c0147 Ensure AtomFont loads with the Editor
-Use PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE which will correctly be set to GEM_MODULE to get loaded at runtime with non-monolithic builds instead of PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE
-Removed the unneeded entries from AutomatedTesting's runtime config now that this is fixed (AtomBridge will bring it in again)
2021-05-20 17:09:05 -07:00
karlberg 3dd40171cd Merging latest origin 2021-05-20 17:08:18 -07:00
Steve Pham 42ccdf0572 Python3 installation script for Linux machines (#832) 2021-05-20 17:08:14 -07:00
Scott Romero 7b525f6a60 [main] windows installer icons and shortcuts
Merge pull request #844 from aws-lumberyard-dev/cpack_installer

Re-organized windows installer resources
Added product logo to bootstrapper UI
Added product icon to bootstrapper exe and control panel entry
Added creation of desktop and start menu shortcuts
Fixed issue where default GUIDs were not properly updated if seed value changes (e.g. version bump)
2021-05-20 16:28:48 -07:00
AMZN-puvvadar fd3927651b Merge pull request #840 from aws-lumberyard-dev/mpgem_scripting_rpc
Add events for MP Gem RPCs plus BC reflection so ScriptCanvas can respond to them
2021-05-20 15:58:29 -07:00
Alex Peterson cfbae9a18b add/remove gem python bindings 2021-05-20 15:13:39 -07:00
Gene Walters a86f61e360 Merge pull request #810 from aws-lumberyard-dev/SPEC6477_NetworkContextScriptCanvas
Reflect functionality to scripting to determine the current network context for an entity/component
2021-05-20 15:12:42 -07:00
scottr 8a594a14de Merge branch 'main' into cpack_installer 2021-05-20 15:12:34 -07:00
Vincent Liu 34be1caa99 [HOTFIX] Fix broken nightly build because of invalid module name (#851) 2021-05-20 14:53:26 -07:00
chiyenteng 01f31cdc56 Move the basic Prefab workflows out from behind the WIP flag (#769)
* Move the basic Prefab workflows out from behind the WIP flag
2021-05-20 14:44:27 -07:00
greerdv 726597ad34 Merge branch 'main' into non-uniform-scale-blast 2021-05-20 22:05:22 +01:00
greerdv 87b1a19df4 remove vector scale from Blast in preparation for removal from Transform 2021-05-20 22:04:37 +01:00
Gene Walters d656afa1c3 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas 2021-05-20 14:03:39 -07:00
moudgils 8e24408959 Merge pull request #819 from aws-lumberyard-dev/DxcExperiment
Update Dxc to the latest + all the fixes related to it
2021-05-20 14:02:33 -07:00
michabr 542256478d Merge pull request #848 from aws-lumberyard-dev/michabr/lyshine_texatlas
Bring back texture atlas builder files
2021-05-20 13:06:10 -07:00
Chris Galvan bb53e8f607 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 14:53:22 -05:00
puvvadar ba6f9867f6 Reorder TCP Select early exit 2021-05-20 12:48:49 -07:00
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-20 14:44:36 -05:00
SergeyAMZN eb3f623bf5 Merge pull request #845 from aws-lumberyard-dev/MultiplayerPipeline
Added support for nested prefabs in multiplayer pipeline
2021-05-20 20:29:42 +01:00
Chris Galvan c105894aa5 [LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered). 2021-05-20 14:28:04 -05:00
Nicholas Van Sickle c1819b6486 Merge pull request #839 from aws-lumberyard-dev/nvsickle/BootstrapFixes
Fix dummy rendering pipeline being created for the Editor
2021-05-20 12:10:22 -07:00
Chris Santora 6deae83906 Merge pull request #736 from aws-lumberyard-dev/Atom/santorac/NewLayeringWorkflow
Updated StandardMultilayerPBR To Use New Layering Model

ATOM-15518 "Change Multilayer PBR To Use Lerp Base Blending"
ATOM-14688 "Disable Individual Layers"
ATOM-14793 "Fix Inconsistent Casing For LuaMaterialFunctorRuntimeContext"
ATOM-4120 "Stabilize Standard PBR Regarding Subsurface and Translucency" (partial)

Changed to lerp-based blending, with an implicit base layer.
Refactored the shader code to collate all the code for each layer into a couple structs and utility functions. This makes the code easier to maintain, and in particular will make it easy for me to add Enable flags for the layers in a subsequent commit.
Added support for disabling individual layers, so you can easily make a 2-layer material instead of a 3-layer material.
Added support to the material system and MaterialEditor for hiding entire property groups. This is used to hide the disabled layers.
Added and updated test data to reflect the new blend model.
Removed subsurface scattering and translucency from StandardMultilayerPBR.
Note to reviewers: There are a lot of changes here, but they are broken down into separate commits. I recommend going through each commit individually rather than doing one comprehensive review.

ASV changes are here: aws-lumberyard/o3de-atom-sampleviewer#55
2021-05-20 12:06:11 -07:00
moudgils 5a149a4594 Merge branch 'main' into DxcExperiment 2021-05-20 11:56:35 -07:00
pereslav cb87b7cd1f Moved early return case in prefab processing 2021-05-20 19:43:33 +01:00
puvvadar 80e12a2df3 Fix whitespace delta 2021-05-20 11:39:25 -07:00
puvvadar d26d24d9bd Remove test RTTIs 2021-05-20 11:38:06 -07:00
AMZN-stankowi c47c45724a LYN-3772 : For non-PBR materials, apply the diffuse color to the base color field on the Atom material, so a color value set in the DCC tool still comes through. (#733) 2021-05-20 11:28:34 -07:00
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 2021-05-20 11:07:45 -07:00
michabr 7d48a7f784 Merge pull request #841 from aws-lumberyard-dev/michabr/lyshine_text
Added AtomFont gem to tool and runtime dependencies for AutomatedTesting project
2021-05-20 11:02:04 -07:00
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 2021-05-20 10:46:48 -07:00
Danilo Aimini c93c457356 Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
LYN-3833 | Position of entity is different after creating it into a prefab
2021-05-20 10:32:42 -07:00
abrmich e975a622b0 Move TextureAtlas builder files to the gem 2021-05-20 10:15:38 -07:00
abrmich 451b850f27 Bring back AtlasBuilder files that were removed with the ImageProcessing gem 2021-05-20 10:15:26 -07:00
michabr 69fed39982 Merge pull request #766 from aws-lumberyard-dev/michabr/lyshine_atom
Add image builder processing bus
2021-05-20 10:02:44 -07:00
abrmich d2cdabbac4 Merge branch 'main' into michabr/lyshine_text 2021-05-20 09:59:22 -07:00
Benjamin Jillich 03b41b620d [LYN-2522] Preparation work for the filter pane (#799)
* [LYN-2522] Preparation work for the filter pane

* Added arrow up/down icons.
* Extended the gem info with the type (Asset, Code, Tool).
* Extended the model with the type and a helper for converting gem uuids into display names.
* Extended the link widget to be clickable with a custom action, needed for the "Show all/less" for the filters.
* Converting the uuids we get from Python to AZ::Uuids and then back to strings to have them all in the same format.
2021-05-20 18:42:37 +02:00
amzn-hdoke 525840fb2a Adding password 1 factor sign in (#830)
AWS automation test
2021-05-20 09:29:44 -07:00
Chris Santora 8799d1ab54 Merge branch 'main' into Atom/santorac/NewLayeringWorkflow 2021-05-20 09:07:08 -07:00
pereslav 43d98ac989 Fixed comment 2021-05-20 16:56:54 +01:00