santorac
04c6f3cc94
cherry-pick 48f3bb7d
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:37:15 -06:00
Guthrie Adams
824da6cabf
update comment and error message
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:34:35 -06:00
Guthrie Adams
c73b6bbe27
Changing lua material functor script loading code to pass the correct sub ID for a compiled script asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:33:48 -06:00
Guthrie Adams
287f08a33c
Fix parent material loading
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:33:10 -06:00
Guthrie Adams
086859d49a
updated comments and error messages
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:32:27 -06:00
Guthrie Adams
fbebf04161
cherry-pick c0acbe7b
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:31:24 -06:00
greerdv
d945a031c1
prevent twist limits being created with equal lower and upper limits
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-11-10 19:30:12 +00:00
amzn-mike
61d0ec9d6b
Remove debug messages. ( #5429 )
...
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-10 13:22:47 -06:00
Mike Chang
5a8f95a414
Fix Wix root and installer url config ( #5500 )
...
Signed-off-by: changml <changml@amazon.com >
2021-11-10 11:21:49 -08:00
amzn-mike
e0cc86e898
Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead ( #5216 ) ( #5381 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit b3301414ad )
# Conflicts:
# Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
2021-11-10 13:21:42 -06:00
Guthrie Adams
6ea951214c
Moving material type asset PostInit call to be consistent with material asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 12:58:47 -06:00
Guthrie Adams
6729941942
adding ifdef to compare loading vs creating material type assets
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 12:57:56 -06:00
AMZN-Phil
541e501b06
Re-add the line to open the cart overlay automatically when a new download starts
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 10:56:44 -08:00
Guthrie Adams
b72970201b
cleanup and setting asset preload flags
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 12:56:38 -06:00
Guthrie Adams
b038faf9ca
material editor loads source data
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 12:55:57 -06:00
Guthrie Adams
87c7023e3c
Merge pull request #5109 from aws-lumberyard-dev/Atom/guthadam/material_editor_loads_source_data2
...
Material editor creates material assets from source JSON data instead of relying on AP
2021-11-10 12:31:17 -06:00
Chris Galvan
314861699d
Merge pull request #5492 from aws-lumberyard-dev/cgalvan/FixedScriptCanvasEntityIdSlotNames
...
Updated some Script Canvas node slot names to EntityID for consistency.
2021-11-10 12:30:43 -06:00
AMZN-Phil
f2e191ea77
Fix trying to remove a cache file
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 10:28:32 -08:00
bosnichd
528a747876
Don't allocate memory when processing WM_INPUT messages. ( #5491 )
...
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-10 11:28:21 -07:00
Shirang Jia
576248a870
Merge Jenkinsfile from development to stabilization ( #5391 )
...
Signed-off-by: shiranj <shiranj@amazon.com >
2021-11-10 10:26:44 -08:00
John
3ced915f8e
Fix attempted rendering of invalid Entity selection boxes.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 17:36:21 +00:00
SJ
0c546828d6
1. Add nullptr checks to prevent crashes when non-critical shaders fail to compile. ( #5451 )
...
2. Add a higher "launch_ap_timeout" for Mac because launching a newly built/downloaded AP can take a while.
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-10 11:31:59 -06:00
SJ
f5c00e9e72
Fix Editor crashes on asset failures ( #5421 )
...
* 1. Add nullptr checks to prevent crashes when non-critical shaders fail to compile.
2. Add a higher "launch_ap_timeout" for Mac because launching a newly built/downloaded AP can take a while.
Signed-off-by: amzn-sj <srikkant@amazon.com >
* Fix one more nullptr dereference.
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-10 11:31:49 -06:00
sphrose
7159e3fe57
Moving to stabilization
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-11-10 17:22:55 +00:00
Esteban Papp
21f9a789c1
Merged the Editor.Camera.Tests with the Editor.Tests ( #5463 )
...
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Adds dependency to Camera.Editor gem which is used by the test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Inheirts from TraceBusHook instead of adding the default env to the test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* makes order consistent between Setup/Teardown
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* adds missing header for non-unity builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Removes dependency to Camera gem
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-10 08:57:39 -08:00
Guthrie Adams
f0b4eb1712
update comment and error message
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 10:54:53 -06:00
AMZN-Phil
0102894a83
Handle servers with no content length and make downloading more obvious
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 08:44:24 -08:00
Scott Romero
ab37eb138c
[development] removed CryLibrary ( #5474 )
...
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] removed all remaining references to CryLibrary
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-11-10 09:43:13 -07:00
rgba16f
8b5fe4a015
Move PipelineStateCache validation of set uniqeness to only be active in debug builds ( #5472 )
...
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-11-10 10:26:03 -06:00
Chris Galvan
847e13154f
Updated some Script Canvas node slot names to EntityID for consistency.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-10 09:55:49 -06:00
Benjamin Jillich
838970206b
Animation Editor: Remove preview label ( #5449 )
...
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-11-10 16:23:43 +01:00
bosnichd
eb775a48dc
Make InputDeviceId's constructor constexpr. ( #5433 )
...
* Make InputDeviceId's constructor constexpr.
See also https://github.com/o3de/o3de/pull/4220
Signed-off-by: bosnichd <bosnichd@amazon.com >
* Updates based on review feedback.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-10 08:06:27 -07:00
jonawals
adf3357176
Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239
...
Fix for Issue #5239 : Component Edit Mode does not disable Entity Inspector interaction
2021-11-10 14:50:36 +00:00
AMZN-Igarri
027b0f86ae
Activate AssetBrowserTableView feature ( #5367 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-10 13:41:59 +00:00
SergeyAMZN
354802d387
Merge pull request #5320 from yuriy0/physx_multi_shape_rigid_body
...
Fix a bug where a rigid body with multiple shapes would ignore all shapes except the first
2021-11-10 12:48:24 +00:00
SergeyAMZN
b9f6d1ec9f
Merge pull request #5311 from aws-lumberyard-dev/HierarchiesFixes
...
Fixed client hierarchy construction to check for authority instead of controller
2021-11-10 12:47:43 +00:00
John
0e3df14ea2
Add missing bus connection/disconnection.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 11:59:28 +00:00
sphrose
c28e92bf51
Merge pull request #5441 from aws-lumberyard-dev/terrain/sphrose/field_name_fix_LYN-8004
...
Various bug fixes.
2021-11-10 10:30:01 +00:00
antonmic
1f72001cdb
Added two missing MeshDataInstance to ModelDataInstance renames in error message
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-11-10 00:56:25 -08:00
antonmic
dcbcab68d2
merging latest to resolve auto-merge conflict
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-11-10 00:52:59 -08:00
santorac
0ae2d75261
Merge pull request #5393 from aws-lumberyard-dev/Atom/santorac/FixSkinScreenshotTests
...
Updated 002_wrinkle_regression_test.material to avoid subsurface scattering artifacts
Having subsurface scattering into a completely back area is an unrealistic scenario and caused colored artifacts. I changed the material to mask out the black areas from applying SS. Corresponding changes will be made to the expceted screenshot in AtomSampleViewer as well.
2021-11-09 19:28:40 -08:00
antonmic
dadf06edda
Fixed issue where skin material wouldn't render if applied to a model with several submeshes and those submeshes had different material types applied to them.
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-11-09 19:03:26 -08:00
Luis Sempé
29de7c0542
Merge pull request #5464 from aws-lumberyard-dev/scripting/improve_assert_msg
...
Improved messaging on assert about argument types lacking reflection …
2021-11-09 17:34:01 -08:00
Vincent Liu
0dca09b039
Update AWS gem info content ( #5281 )
...
* Update AWS gem info content
Signed-off-by: liug <liug@amazon.com >
* Tweak requirement statement based on feedback
Signed-off-by: liug <liug@amazon.com >
2021-11-09 16:56:06 -08:00
santorac
d6348384c3
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/FixSkinScreenshotTests
2021-11-09 16:11:23 -08:00
Ken Pruiksma
31439eb7c8
Adding m_exposure field to terrain's object srg to sync it with the default object srg. ( #5462 )
...
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-11-09 17:52:26 -06:00
moraaar
15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h ( #5448 )
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-11-09 15:42:01 -08:00
Gene Walters
c99071533d
Small: fix typo
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-09 15:39:43 -08:00
Gene Walters
c8b9f05079
Ensuring the 4 types of RPCs (1)Autonomous->Authority (2)Authority->Autonomous (3)Authority->Client and (4)Server->Authority all compile. Invoking anything that starts from Autonomous or Authority requires a controller (otherwise just requires a component), and anything handled by Authority or Autonomous requires a controller for Handle on OnEvent methods (otherwise OnEvent and Handle occurs on the component)
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-09 15:35:17 -08:00
lsemp3d
934c0f2ec7
Made SerializeContext and BehaviorContext consistent with their class name
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-09 15:25:06 -08:00