Commit Graph

178 Commits

Author SHA1 Message Date
hultonha e05ab8bfb7 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-28 15:03:05 +01:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
daimini caa982372f Remove include for removed interface in EditorPrefabComponent.cpp 2021-04-27 14:12:56 -07:00
daimini 797ee26f87 Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly. 2021-04-27 14:12:46 -07:00
hultonha 64e06c3010 more updates to camera code 2021-04-27 19:40:45 +01:00
mnaumov 03e681ca5f Merge from main 2021-04-27 11:26:02 -07:00
mnaumov 5f33337fec Merge main 2021-04-27 11:05:22 -07:00
AMZN-mnaumov a00d47365e Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
hultonha 1b946818a2 more tidy-up to CameraInput.cpp 2021-04-27 13:58:17 +01:00
hultonha 80108fd848 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-27 13:13:53 +01:00
amzn-sean fbb8727407 Merge branch 'main' into physx_ragdoll_create 2021-04-27 11:04:04 +01:00
hultonha c898318377 updated camera changes 2021-04-27 10:30:07 +01:00
mnaumov fdcb19f45a Reverting some unused code 2021-04-26 17:48:49 -07:00
mnaumov 91f027a05c PR feedback 2021-04-26 17:42:49 -07:00
AMZN-daimini 44f1a627e7 Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
2021-04-26 13:20:35 -07:00
mnaumov c4e3c39ee2 PR feedback 2021-04-26 12:44:51 -07:00
hultonha 15afcc341d fixes and updates to CameraInput 2021-04-26 19:46:57 +01:00
Chris Galvan 5d2db78f74 [LYN-3272] Added missing call in unit test. 2021-04-26 13:25:55 -05:00
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 2021-04-26 11:49:48 -05:00
AMZN-AlexOteiza 3f32cc929c Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
2021-04-26 15:25:34 +01:00
mnaumov 0bcc85e4d8 scope pointer 2021-04-23 21:55:14 -07:00
mnaumov 30458bc1be PR feedback 2021-04-23 21:40:27 -07:00
daimini 833ca2767d Fix a bug with level save erasing link information on Instances. All changes to non-root container entities are now saved as patches in the link to the parent instance. 2021-04-23 20:14:17 -07:00
Guthrie Adams fb26308a26 Merge pull request #291 from aws-lumberyard-dev/Atom/guthadam/ATOM-15326
ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
2021-04-23 17:39:27 -05:00
mnaumov 9f4606c17a Removing test code 2021-04-23 15:01:11 -07:00
mnaumov b215d1c098 Enlarged thumbnails on hover 2021-04-23 14:56:28 -07:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
amzn-mike 16ca036ea8 Merge pull request #256 from aws-lumberyard-dev/amzn-mike/lyn-2249-disable-cancel
Disable Asset Load Cancellation
2021-04-23 13:10:56 -05:00
guthadam 923f234d71 ATOM-15326 support for image thumbnails in asset browser and thumbnail widget
This change adds support for streaming image thumbnails in the asset browser tree and thumbnail widget.

This is a prerequisite for displaying image previews inside of the material inspector.

https://jira.agscollab.com/browse/ATOM-15326

https://jira.agscollab.com/browse/ATOM-14003
2021-04-23 13:07:20 -05:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
AMZN-daimini e772afa06e Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
2021-04-23 09:23:31 -07:00
amzn-mike d25179303d Add jira ticket for disabled tests 2021-04-23 10:50:58 -05:00
amzn-mike c61b244416 Use a const to toggle asset cancellation on and off 2021-04-23 09:56:59 -05:00
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 2021-04-22 23:36:29 -07:00
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 2021-04-22 17:01:29 -07:00
mnaumov 09a0676b9c Adding custom title to PropertyAssetCtrl 2021-04-22 16:56:56 -07:00
daimini 8f79379bc8 Fixes as per Ram's review 2021-04-22 16:45:20 -07:00
daimini 76739de282 Fix spacing 2021-04-22 15:52:39 -07:00
daimini ea43eb3ac9 Set position of instantiated prefab 2021-04-22 15:49:13 -07:00
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-22 14:54:01 -07:00
daimini c9a4b6f50b Better handle the default case for Instantiate 2021-04-22 14:53:07 -07:00
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 2021-04-22 13:57:08 -07:00
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 2021-04-22 15:38:32 -05:00
amzn-mike 58e8233c2c Remove debug message 2021-04-22 15:27:16 -05:00
amzn-mike 0428189bed Increase test difficulty 2021-04-22 15:18:54 -05:00
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 2021-04-22 15:03:04 -05:00
amzn-mike 35a47932eb Disable weak references and unit tests for them. 2021-04-22 15:02:41 -05:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00