Commit Graph

1486 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
jjjoness 0aad6ad08d Merge pull request #1477 from aws-lumberyard-dev/LYN-2509b
Cherry picked from development
2021-06-22 14:46:18 +01: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
Terry Michaels 858dee2210 Need to keep full asset paths around in LuaIDE (#1470) 2021-06-22 07:05:42 -05:00
Tom Hulton-Harrop dc343e2b65 Small camera updates (#1460, LYN-2315)
* add interpolation for goto position/orientation

* resize default camera look-at point
2021-06-22 12:53:20 +01:00
John Jones-Steele 66c4541e14 Fixed merge error in NewLevelDialog 2021-06-22 11:25:53 +01:00
jjjoness 1ec238685d Merge branch 'stabilization/2106' into LYN-2509b 2021-06-22 10:07:28 +01:00
John Jones-Steele 2dce6954a1 Cherry picked from development 2021-06-22 09:41:48 +01:00
sphrose 4d02e0b8bb Merge pull request #1454 from aws-lumberyard-dev/LYN-3619
New level dialog has no way to select a different folder
2021-06-22 09:15:08 +01: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
Esteban Papp 9720984c61 SPEC-7437 Launcher_Windows.cpp failing to compile 2021-06-21 15:39:13 -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
amzn-mike a963cd3ac8 Merge pull request #1382 from aws-lumberyard-dev/Helios_TransformImporterFixV2_stabilization_2106
AssImp: Transform Importer Fix V2
2021-06-21 15:46:10 -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
amzn-mike 514cfc3b4c Fix compile error 2021-06-21 12:27:13 -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
amzn-mike 40ed743ca9 Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 11:50:17 -05: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-mike d2d588901e Address PR feedback 2021-06-21 11:00:27 -05: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
amzn-mike bfe391b4bb Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106 2021-06-21 08:16:21 -05:00
greerdv 772a75b5bc exposing non-uniform scale component id as a behavior constant for hydra 2021-06-21 11:12:50 +01:00
sphrose a3b7cbeffc New level dialog has no way to select a different folder 2021-06-21 10:02:10 +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
Steve Pham f91ba1a80b Minor pre-license update cleanup of files (#1437)
- Remove legacy CryEngine.tip file
- Remove legacy WAF files
- Renamed Lumberyard to O3DE
- Updating "Amazon.com" to "Open 3D Foundation"
2021-06-18 16:09:18 -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
AMZN-koppersr c333824673 Merge pull request #1001 from yuriy0/SerializeContextToolsConvertHandleAnyValidation
Bug fix: handle the case where the data source type is `any' in the SCT converter command validation step.
2021-06-18 13:51:34 -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
Ken Pruiksma 2bc36aa6c6 [SPEC-5991] Removing ImageHDR.h/.cpp. These files are no longer needed and created a licensing issue. (#1420)
The only place this code was referenced was in using textured tooltips, if the texture used for that tooltip was a .hdr file. However, the few .hdr files in all of o3de are Atom material / lighting related - definitely not used for tooltips.

It's likely bitmap tooltips in general are not used at all anymore, so more code could probably be ripped out, but this solves the immediate problem without making too many changes.
2021-06-18 13:05:35 -05:00
bosnichd 34e64ca5b0 Remove unused MTPseudoRandom.h/.cpp to address SPEC-5990 (#1426) 2021-06-18 08:59:10 -06: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