Commit Graph

941 Commits

Author SHA1 Message Date
Mike Balfour 9aa44a56e7 Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
2021-06-22 15:14:22 -05:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
AMZN-puvvadar 0186911a3a Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
moudgils 4f84ec90d3 Various new metal fixes (#1465)
* - Fix the second window related tabbing issue
- Merge calls to UseResoources acrooaa all the SRGs
- Move SamplerCache to the device to ensure only one cache to reduce duplication
- Fixes to compute threading numbers getting reset to 0,0,0
- Cleanup withing BufferPoolResolver
- Argument buffers are now queued to be cleaned up upon shutdown
2021-06-22 08:58:15 -07:00
Benjamin Jillich 7d5a7b47ac [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities (#1392)
* [LYN-3717] When pulling in an actor FBX, two entities are spawned & [ATOM-15258] Clicking and Dragging fbx file into viewport produces 2 entities
* Added another operation to the CanSpawnEntityForProduct that checks the other products and can veto the creation process.
* The model product will not create an entity in case there is already an actor exported, which prevents the issue reported by two different teams/users.
2021-06-22 14:12:42 +02:00
Esteban Papp bfd266db8f LYN-4659 OSX: Prebuilt Editor and Asset Processor fail to launch (#1446)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file

* fixing lrelease patching in mac/windows

* reverting change and disabling warning, the intention of the test is to compare to unitialized values

* Fix for dxc

* no need to disable the warning, just remove the const

* missing dependency to EditorCommon
2021-06-21 18:24:29 -07:00
puvvadar 4d0d97b3fe Remove excessive assert 2021-06-21 16:52:05 -07:00
Danilo Aimini a0f4f16b98 Fix Duplicate function to correctly replace the aliases in patches that get ported over. Also correctly undo/redo link creation. (#1449) 2021-06-21 15:47:25 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
Terry Michaels ca76a4d1ab Moved helpers to the top level menu bar above viewport (#1464) 2021-06-21 16:11:50 -05:00
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 2021-06-21 11:46:16 -07:00
Nicholas Van Sickle b032177418 Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18
Merge stabilization/2106 into development
2021-06-21 10:58:07 -07:00
Terry Michaels 74bb2737ca Replaced menu icon in secondary toolbar (#1459) 2021-06-21 12:50:26 -05:00
sconel e357dea06c Merge pull request #1447 from aws-lumberyard-dev/Spawnable/GameModeLoadErrorFix
Spawnable/game mode load error fix
2021-06-21 09:57:44 -07:00
greerdv 0e5ec11cdc Merge pull request #1455 from aws-lumberyard-dev/non-uniform-scale-hydra
exposing non-uniform scale component id as a behavior constant for hydra
2021-06-21 17:21:17 +01:00
jjjoness 3549205d29 Merge pull request #1458 from aws-lumberyard-dev/LYN-4195b
LYN-4195b - UX - main menu updates - prevent hover effect on the top level menu icon, dim the link icon and increase space between text and icon throughout.
2021-06-21 17:20:33 +01:00
amzn-sean 9f934a6f63 add Draw Helpers changed notification + physx draw helpers listens to it (#1456) 2021-06-21 16:25:45 +01:00
John Jones-Steele 5e4f021d55 Cherry picked from development 2021-06-21 15:28:41 +01:00
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 2021-06-21 11:12:50 +01:00
IgnacioMartinezGarrido e4e22879b8 LYN-1767: Search View Crash Fix (#1430)
* Fixed crash in tableView when the filter goes empty and there is a selected entry.

* fixed consts

* Code Review Changes

* more minor fixes
2021-06-21 10:49:01 +02:00
sconel bb0c60d1d4 Correctly add generated spawnables to asset manager in game mode 2021-06-18 16:43:14 -07:00
Stephen Tramer b78fa5eed4 Merge pull request #1372 from aws-lumberyard-dev/stramer/az-networking-docs
Networking libraries + Gems API documentation
2021-06-18 15:53:42 -07:00
srikappa-amzn 8f3c227842 Merge pull request #1438 from aws-lumberyard-dev/Prefab/DetachPrefabBugFixes
Fix bug with DetachPrefab incorrectly replacing old entity aliases in patches
2021-06-18 13:34:01 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Danilo Aimini acd23698ea Prefab Serialization | Remove "Source" parameter from prefab source file (#1387)
* When loading a template to memory, store the current Source (potentially overriding what was stored to disk)

* Before storing the prefab disk, remove the Source parameter from the Dom (as it's no longer necessary to save it).
2021-06-18 12:37:37 -07:00
Esteban Papp c02345fd71 LYN-4657 OSX: Building AutomatedTesting project fails (#1436)
* LYN-4657 OSX: Building AutomatedTesting project fails

* forgot this file
2021-06-18 11:57:37 -07:00
sconel 49b3c4d11f Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into Spawnable/GameModeLoadErrorFix 2021-06-18 11:20:25 -07:00
srikappa 4d90b7cfb6 Fix bug with detachPrefab incorrectly replacing old entity aliases in patches 2021-06-18 11:19:59 -07:00
amzn-sean 84de2d2e12 Fixed failing periodic physics tests (#1429) 2021-06-18 15:38:49 +01:00
amzn-sean b17c5ca3e6 adding physics tick time to post simulate event (#1401) 2021-06-18 14:09:34 +01:00
Tom Hulton-Harrop 108b6f8e0c Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) 2021-06-18 12:44:34 +01:00
Hasareej 4ad97342c2 Hasareej fix whitebox and physx cluster icons (#1398)
Fixing the issue with the icons not appearing & deleting duplicate icons.
2021-06-18 11:45:48 +01:00
John e4d4f8555b Merge branch 'development' into TIF/Runtime 2021-06-18 10:15:04 +01:00
Hasareej 75e640b908 Hasareej lyn 4389 fix cluster overlap with ImGui (#1329)
Fixing the cluster overlap with ImGui & a ViewportDisplayLayout alignment issue.
2021-06-18 09:50:02 +01:00
stramer 673495c49d Address additional review comments.
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
2021-06-17 18:01:44 -07:00
Chris Burel 6d0ef1cf57 Avoid reading from a destroyed variable (#1347)
This code iterates over the items in a vector, and if one case is met,
it mutates that same vector. This invalidates the object, as the place
where that object used to be has been moved.
2021-06-17 17:54:10 -07:00
sconel f825e698c9 WIP fix for referenced assets being loaded before their registration 2021-06-17 17:37:00 -07:00
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 2021-06-17 16:25:44 -07:00
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 2021-06-17 16:17:36 -07:00
Mike Balfour f6fc425a1a Prefab support for dynamic vegetation (#1374)
* First version of prefab support for dynamic vegetation

* Addressed PR feedback
- Made MockSpawnableEntitiesInterface a proper GMock in AzFramework
- Added Get/SetSpawnableAssetId
- Added lots of comments to better explain things that were asked about in the PR

* Exposed AzFrameworkTestShared on all platforms, not just host platforms
2021-06-17 16:24:33 -05:00
stramer c7399537e2 Address review feedback.
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
2021-06-17 14:15:56 -07:00
Esteban Papp 98767862af LYN-4071 Mac compile times are excessive 2021-06-17 13:41:36 -07:00
lumberyard-employee-dm 7dabe8b6e9 Updated Several Engine Gem's CMakeLists.txt to add themselves as required Gems (#1262)
* Fixed organization of the AssetProcessor SourceAssetBrowser

Assets within the Engine Root were grouped under a '/' entry.
That has been fixed to use the relative path within the engine root for
those assets
Assets outside of the Engine Root, but on the same drive were using
absolute paths before. Now there are child entries that navigate up the
directory hierarchy to those asset locations

* Added ly_enable_gems call to Atom gems targets that are required

The DefaultLevel.prefab contains several Atom components, that require
the Atom RHI, RPI, Common_Feature, ShaderBuilder and AtomLyIntegration CommonFeatures
gems to be enabled in order to successfully process in the
AssetProcessor.

* Added ly_enable_gems call to make the Camera gem required in Tools,
Builders and Clients.

This is needed as the DefaultLevel.prefab contains an Editor Camera
Component

* Adding the ly_enable_gem call to make the Maestro gem required

CrySystem currently requires Maestro to be enabled in order to
initialize

* Added ly_enable_gems call to the SceneProcessing gem to make it required

The SceneCore and SceneData libraries that are part of the core engine
Code folder requires the SceneProcessing gem to be enabled in order to
invoke the InitializeDynamicModule hooks in DllMain.cpp in order to
initialize those libraries.

* Fixed bad argument in comment for Prefab CMakeLists.txt

* Fixed Assert in Asset Builders due to the Atom RPI Builder

The Atom RPI Builder was enabling the Asset Catalog for the ScriptAsset a second time

The Atom Feature Common EditorSystemCommonComponent.cpp which also loads
in the AssetBuilder is enabling the Asset Catalog for the ScriptAsset

Added BehaviorContext reflection to the OutputDeviceTransformType enum
to fix the BehaviorContext errors about reflecting a method that returns
such an enum

* Added TypeId output to the JsonDeserializer report message about missing
ClassData

Previously the report callback would indicate that the target type was
missing Serialization class data, but didn't indicate the TypeId of the
target type

* Added support to the ly_enable_gems function to be able to support
0 gems being enabled.

Updated the Install step for CMake to propagate any ly_enable_gems
within a CMakeLists.txt for a target into the generated CMakeLists.txt
that is made for each installed IMPORTED target

* Adding newline to the end of the Camera Gem CMakeLists.txt

* Fixing target TYPE parameter for actual Gem Modules to use the GEM_MODULE tag instead of MODULE

* Reverting change to the DESTINATION directory for the installed CMakeLists.txt to use the relative path to the installed directory

* Adding the Atom_Bootstrap gem as a required gem

The Client and GameLaunchers required the Atom_Bootstrap gem in order to create the NativeWindow
Added Atom_Feature_Common client module as a runtime dependency of the AtomLyIntegration CommonsFeature client module

* Fixed register.py --all-projects-path and --all-gems-path arguments to
NOT register projects or gems that are within a template folder
Fixed reading of old pre-1.0 o3de_manifest.json files where the
"engines" key was a json array

* Changed how the relative target source directory is calculated when that source directroy resides outside of the engine root.
The final dirname component is used with a unique SHA256 has to form a <dirname>-<8 char SHA256> folder for installing files into

* Adding newline to the end of Atom_Bootstrap CMakeLists.txt

* Moving ly_enable_gems variants for Tools and Builders inside of PAL_TRAIT_BUILD_HOST_TOOLS block

* Adding a comment to AWSCore.ResourceMappingTool target to indicate that it is not a GEM_MODULE.
Furthermore it cannot be loaded with the Gem system because the library is in a different directory the executable
2021-06-17 13:58:20 -05:00
Gene Walters 4be9ce56c4 Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
Tom Hulton-Harrop 8ffd16b0be Ensure SnapToGrid only appears when GridSnapping is enabled LYN-2302 (#1362)
* updates to better support showing/hiding viewport ui when grid snapping is enabled/disabled

* connect up editor settings callbacks

* minor polish changes

* api rename

* updates following review feedback
2021-06-17 18:31:56 +01:00
AMZN-koppersr 6b08ab6e03 Merge branch 'stabilization/2106' into JsonSerialization/ArrayDefaultsFix 2021-06-17 09:32:43 -07:00
Gene Walters eadbb17034 Cherry picking fff7cc0e10. Redcoding parts of old Networking that used Bullet external physics code 2021-06-17 09:04:22 -07:00
amzn-sean 9f62d631fb Physics joints updated to the new API (#1361)
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com>
2021-06-17 15:52:27 +01:00
John 22093f46fc Merge branch 'development' into TIF/Runtime 2021-06-17 11:34:31 +01:00
John Jones-Steele 127ad7f833 Merge branch 'development' into LYN-4195 2021-06-17 09:20:22 +01:00