Commit Graph

2007 Commits

Author SHA1 Message Date
moudgils a4a22a2cfa Merge branch 'DxcExperiment' of https://github.com/aws-lumberyard-dev/o3de into DxcExperiment 2021-05-18 20:43:07 -07:00
moudgils 1ebb7c405f Merge branch 'main' into DxcExperiment 2021-05-18 20:24:52 -07:00
moudgils 0a2c95cc20 Add Mac's dxc package 2021-05-18 17:42:41 -07:00
bosnichd a2608e187b Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873) (#811)
Resurrect error.log and error.dmp file output when the engine crashes (LYN-3873). This was recently removed as part of 96b85e6813920554f7dfdc7752c1dd4452919b92
2021-05-18 17:37:02 -06:00
AMZN-puvvadar 29b4ab6ff3 Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
2021-05-18 16:28:08 -07:00
Scott Romero c275be092e [main] online installer support for windows
Merge pull request #804 from aws-lumberyard-dev/cpack_installer
2021-05-18 15:38:53 -07:00
puvvadar 350e5a0cd2 Update to const auto& 2021-05-18 15:22:22 -07:00
puvvadar 55ecd8517d Add assert to new Asset constructor to declare intent and safeguard ID overwrite 2021-05-18 14:57:27 -07:00
scottr b3b54742f7 Merge branch 'main' into cpack_installer 2021-05-18 14:20:57 -07:00
puvvadar e2ade654fb Address misc feedback 2021-05-18 13:52:28 -07:00
Tommy Walton 3182dc37c3 Fix for ATOM-15488 : Rendering out an animation with shadows crashes the editor (#794)
Previously, the SkinnedMeshFeatureProcessor assumed there would only be one skinning pass. However, that's not always the case. When rendering with track view, the feature processor was getting a pass that only updated once every three frames, which could lead to a condition where a skinned mesh was released, but the pass never submitted and cleared the previously added dispatch items, and one or two frames later it would go to submit after the skinned mesh and all of its resources had already been released.

-Modified the skinning and morph target compute passes to pull dispatch items from the feature processor instead of the feature processor pushing them to the passes.
-If more than one skinning (or morph target) pass is active in the frame, whichever one is first will submit all the dispatch items, and clear the feature processor's dispatch items before the next one tries to submit anything
-Moved the logic for caching shader options from the SkinnedMeshComputePass to the SkinnedMeshFeatureProcessor, since there may be more than one pass but only one feature processor per scene
2021-05-18 13:52:01 -07:00
srikappa-amzn 3c40aad148 Merge pull request #792 from aws-lumberyard-dev/Prefab/CreatePrefab
Bug fixes for creating prefabs with nested entities
2021-05-18 13:33:34 -07:00
SergeyAMZN 6626a7cf8e Merge pull request #682 from aws-lumberyard-dev/MultiplayerPipeline
Added support for parent-child networked entities
2021-05-18 21:23:32 +01:00
scottr b91fc8648d Merge branch 'main' into cpack_installer 2021-05-18 11:51:58 -07:00
scottr 54dc47eb91 [cpack_installer] fixed typo in help string 2021-05-18 11:50:01 -07:00
SSpalding 39de8631f2 Caught KeyError and changed to log message. (#782)
Fixed missing key breaking report combining.
2021-05-18 11:13:59 -07:00
AMZN-AlexOteiza 906780a01f Reorganized PythonTests CMakeLists (#716)
Reorganized Python Tests CMakeLists.txt

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-05-18 19:11:56 +01:00
Tommy Walton c10e37f2d6 Atom-15447 : Crash on null buffer with many morph targets
Fixed a crash by keeping a reference to the buffer instance after creating it and checking for null
2021-05-18 10:54:39 -07:00
Tommy Walton d0810892f1 ATOM-15358 : Culling concurrency checker fails in AtomSampleViewer (merge from 1.0->main)
Inserting, updating, and removing entries from a VisibilityScene was made thread safe in a previous change, and now both the MeshFeatureProcessor and DiffuseProbeGridFeatureProcessor update entries at the same time from multiple threads. This leads to an assert in the Culling concurrency_checker, even though this is now valid behavior.

However, we still don't want to be adding, removing, or updating cullables between BeginCulling and EndCulling, which could cause a mismatch between the result of OctreeScene::GetEntryCount and the actual number of cullables in the scene.

-Added soft_lock_shared/soft_unlock_shared to the concurrency checker to allow multiple threads to acquire a lock when that is the desired behavior, while still asserting that nothing tries to acquire a shared lock when the concurrency checker is already locked.
-Update Culling.cpp to use the new soft_lock_shared when adding, updating, or removing cullables
-Added unit tests for the concurrency_checker
-Updated ArrayView unit test to use AZ_TEST_START_TRACE_SUPPRESSION instead of manually checking the assertion count, so that test now passes in release builds which do not assert.
2021-05-18 10:53:41 -07:00
Tommy Walton 343fc1999f ATOM-15346 : Morph target buffer only found on first Atom mesh (merge from 1.0->main)
Instead of assuming the first submesh will always have a reference to the morph target buffer, search the submeshes to find the first one that does.
2021-05-18 10:52:41 -07:00
puvvadar e03645f816 Disable editorsv launch by default 2021-05-18 10:48:39 -07:00
puvvadar 19316e422b Check launch process exists before waiting for 15 seconds 2021-05-18 10:46:18 -07:00
bosnichd 7a557c05ac Remove or update some remaining non-inclusive terms. (#793) 2021-05-18 11:43:57 -06:00
srikappa 1a1d608c7a Merge branch 'main' into Prefab/CreatePrefab 2021-05-18 10:22:33 -07:00
Steve Pham fed56805f5 Fix issue with layout tool and symlinks on Mac (#791)
* - Fix reversed symlink logic for Non-Windows file systems
- Add additional logic to clear existing symlink if it exists before re-applying

* Update to remove pre-existing reference regardless if its a symlink or not
2021-05-18 10:09:09 -07:00
Terry Michaels 7109cbbc98 Removed non-inclusive terms from comments (#803) 2021-05-18 11:43:55 -05:00
Terry Michaels f624fefeac Make AutomatedTest dependent on Qt5::Test for imports in tests that use it (#802) 2021-05-18 11:43:05 -05:00
Terry Michaels 8cfe16c06f Added null check for m_font (#801) 2021-05-18 11:42:31 -05:00
pereslav f721aa511f Fixed entity IDs of the original & networked spawnables 2021-05-18 17:15:24 +01:00
mrieggeramzn aab4b4a126 Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
Making shadow res of 1024 and bicubic pcf the default
2021-05-18 09:13:49 -07:00
Aaron Ruiz Mora dd398891c9 Improve iOS string handling in DynamicModuleHandle_iOS 2021-05-18 16:43:51 +01:00
Tom Hulton-Harrop 43258be51c Merge pull request #786 from aws-lumberyard-dev/hultonha_LYN-2215_camera-viewport-3
Add new orbit functionality for camera
2021-05-18 15:37:38 +01:00
Aaron Ruiz Mora 87ec96fbf4 Fix compilation errors in windows release 2021-05-18 15:26:45 +01:00
pereslav b821a3a12d Fixed build 2021-05-18 14:00:41 +01:00
pereslav 85374ea7fc Merged from main 2021-05-18 13:10:44 +01:00
amzn-sean 672dad7fea combined the 2 physics shape collider config pair types into 1(#778) 2021-05-18 12:39:07 +01:00
Tom Hulton-Harrop c4fa373e43 Temporarily ignore failing test to get main to go green (#795)
* keep test_CLITool_AssetBuilder_Works running but ignore failure for now
2021-05-18 11:07:44 +01:00
Benjamin Jillich 6d7c2f1a0c Reusable selection proxy model (#780) 2021-05-18 11:16:00 +02:00
scottr b45d01919d [cpack_installer] simplify guid generation by using existing project props instead of timestamp in seed value. add bootstrapper specific guids. 2021-05-18 00:22:17 -07:00
scottr 66ad040102 [cpack_installer] some minor comment cleanup 2021-05-17 22:51:48 -07:00
scottr 78d6909bda Merge branch 'main' into cpack_installer 2021-05-17 21:53:11 -07:00
scottr efbb0077b5 [cpack_installer] configure install to be per machine 2021-05-17 21:43:46 -07:00
scottr 37b2ac797d [cpack_installer] bootstrap installer is copied to root of build directory. uploads directory is cleaned before copied to. 2021-05-17 20:52:06 -07:00
moudgils 83f29f4a34 Updated to one Dxc package 2021-05-17 20:39:39 -07:00
puvvadar 920f85981d Add another missed header file 2021-05-17 18:55:00 -07:00
puvvadar cf4e04ba57 Cleanup a few more headers 2021-05-17 18:52:40 -07:00
srikappa 761a77a436 Avoid creating a new list for non-container top level entities 2021-05-17 18:51:23 -07:00
puvvadar 93e267345f Address string/mem feedback plus some misc cleanup 2021-05-17 18:46:21 -07:00
srikappa eb873f246a Merge branch 'main' into Prefab/CreatePrefab 2021-05-17 17:13:02 -07:00
srikappa 45074c651a Fix bugs with creating prefabs with nested entities 2021-05-17 17:10:50 -07:00