Commit Graph

318 Commits

Author SHA1 Message Date
sconel c3c90cc821 Merge branch 'main' into Spawnable/ProductDependency 2021-04-28 15:40:10 -07:00
sconel 3b49b59c32 Added AddProductDependency calls to PrefabProcessorContext 2021-04-28 12:03:09 -07:00
AMZN-koppersr b4976ff9cb Merge pull request #327 from aws-lumberyard-dev/JsonSerializationTypeIdBug
Typeid bug fix in Json Serialization.
2021-04-28 10:44:42 -07:00
Guthrie Adams 518c6cb760 Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
ATOM-14003 adding image thumbnails to material inspector properties
2021-04-28 12:34:54 -05:00
cgalvan bbcc4ffeb1 Merge pull request #390 from aws-lumberyard-dev/cgalvan/RemoveUnusedDialogs
[LYN-3319] Removed some unused Editor dialogs.
2021-04-28 12:30:59 -05:00
Nicholas Van Sickle 9d44d5710a Merge pull request #334 from aws-lumberyard-dev/nvsickle/RestoreViewportLayoutInContextMenu
Fix "Configure Layout..." being greyed out in the viewport menu
2021-04-28 10:17:43 -07:00
Tom Hulton-Harrop 5d53590434 Merge pull request #310 from aws-lumberyard-dev/hultonha_PR-37_follow-up
Updates following review feedback to PR-37
2021-04-28 17:27:26 +01:00
AMZN-koppersr 2dfe9942f2 Merge branch 'main' into JsonSerializationTypeIdBug 2021-04-28 09:23:41 -07:00
Chris Galvan 28b5a1427c [LYN-3319] Removed some unused Editor dialogs. 2021-04-28 11:23:40 -05:00
Guthrie Adams 167b7f36a6 Merge pull request #373 from aws-lumberyard-dev/Atom/guthadam/ATOM-15370
ATOM-15370 Fix thumbnail scaling and sizing issues
2021-04-28 11:01:14 -05:00
cgalvan 65565daf5a Merge pull request #370 from aws-lumberyard-dev/cgalvan/CherryPickDragAndDropHitTest
[LYN-3122] Cherry-pick: Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position.
2021-04-28 10:26:49 -05:00
jjjoness cdce28115e Merge pull request #387 from aws-lumberyard-dev/LYN-1932
Lyn 1932
2021-04-28 16:21:43 +01:00
SergeyAMZN 52864bd92f Merge pull request #255 from aws-lumberyard-dev/MultiplayerPipeline
Added delayed activation for client networked entities. Added ability to specify additional .cfg file to use the same launcher for server & client
2021-04-28 16:19:34 +01:00
jjjoness 88dcaba8da Merge pull request #317 from aws-lumberyard-dev/LYN-1099
Lyn 1099
2021-04-28 16:16:04 +01:00
cgalvan 60d876a05e Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
2021-04-28 10:07:07 -05:00
hultonha 6d624273a9 disabling test causing intermittent failures 2021-04-28 14:43:52 +01:00
jjjoness 2aafdab5af Added the new focus color. 2021-04-28 12:06:56 +01:00
jjjoness bf95c706d8 Merge branch 'main' into LYN-1932 2021-04-28 11:34:43 +01:00
hultonha d36a9470a3 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-28 09:27:00 +01:00
jjjoness 1fd6938519 Replaced missing & 2021-04-28 08:56:02 +01:00
pereslav f235174c45 Merge branch 'MultiplayerPipeline' of https://github.com/aws-lumberyard-dev/o3de into MultiplayerPipeline 2021-04-28 07:49:47 +01:00
pereslav b82627a248 Renamed console_command_file to console-command-file 2021-04-28 07:44:11 +01:00
guthadam 5cac07b4c1 ATOM-14003 adding image thumbnails to material inspector properties
https://jira.agscollab.com/browse/ATOM-14003
2021-04-28 00:17:58 -05:00
karlberg 6bb51bd9e4 Merging latest origin 2021-04-27 19:14:11 -07:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 2021-04-27 18:46:26 -05:00
guthadam 7e8b1e8c80 Fix linux build 2021-04-27 17:57:09 -05:00
Danilo Aimini 963e851119 Merge pull request #372 from aws-lumberyard-dev/LYN-3060-cherry
Cherry-pick: LYN-3060 | Launching the Editor with Prefab System enabled results in asserts
2021-04-27 15:37:48 -07:00
Chris Galvan 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. 2021-04-27 16:56:20 -05:00
guthadam eeafb5eaa3 ATOM-15370 Fix thumbnail scaling and sizing issues
TLDR
Thumbnails size will be removed from the system.
Each thumbnail class is responsible for determining its stored size.
Images and other thumbnail types can be scaled up or down within reason without blurring.

The thumbnail system uses the concept of context and size organize thumbnails by size based on their intended use.  However, most of the thumbnail classes do not respect or use the specified size, which is 16 by 16 pixels and really only usable for small icons.

The thumbnails are currently being used in the asset browser tree control, the larger asset browser previews, the material component property asset controls, the material component inspector for the large preview, and other places.  Each of these places use completely different sizes, some of which are large and change dynamically. Whenever the thumbnails are painted they are scaled to the desired size.

Material and mesh thumbnails were always being captured at 512x512 regardless of what the rest of the thumbnail system said.  Source, product, and folder thumbnails would be stored at the original asset size.  The loading movie thumbnail was always drawn at 16 by 16 and scale up so it was always blurry.  Image thumbnails were always scaled down to 16 by 16 and scale up for larger previews.

Rather than worrying about the size of each context, each thumbnail class will store the image at whenever it deems to be a large enough size that can be scaled down when used.

This may eliminate the need for multiple thumbnail contexts which are not being used anyway.

https://jira.agscollab.com/browse/ATOM-15370
2021-04-27 16:43:06 -05: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
Chris Galvan 84e0f6f58d [LYN-3122] Moved invariant logic outside of for loop and removed TODO comment. 2021-04-27 15:54:45 -05:00
Chris Galvan f269d92f90 [LYN-3122] Fixed the viewport Entity hit test logic. This allows the BuildDragDropContext to detect hit position correctly so that assets dragged into the viewport are placed in the correct position. 2021-04-27 15:54:23 -05:00
pereslav f1ae3f52b0 Merge branch 'main' into MultiplayerPipeline 2021-04-27 21:23:22 +01:00
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 2021-04-27 15:16:20 -05:00
Junbo Liang 83f3cbd4a1 Merge pull request #151 from aws-lumberyard-dev/SPEC-6072
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
2021-04-27 12:13:21 -07: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
jjjoness 0607f6efa6 Changed Play Console from comments in PR. 2021-04-27 18:37:14 +01:00
AMZN-koppersr 0f8e6cbda1 Fixed a Linux build error. 2021-04-27 10:36:43 -07:00
junbo 0b8299ba0b Remove the existing crashpad package and update the package hash 2021-04-27 09:50:20 -07:00
junbo eb0758f63a [SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows 2021-04-27 09:48:50 -07:00
amzn-sean 6987dac6f3 Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create
Ragdoll now uses Add/Remove SimulatedBody
2021-04-27 15:53:23 +01:00
Aaron Ruiz Mora 00fca9489c Fix editor crashing by protecting gEnv->g3DEngine 2021-04-27 14:52:10 +01:00
amzn-sean 82fce4a90c Merge branch 'main' into physx_ragdoll_create 2021-04-27 14:21:10 +01:00
pereslav 44ce664730 Changed handling --console_command_file to use AZ::Console::ExecuteConfigFile 2021-04-27 12:36:17 +01:00
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-27 11:41:13 +01:00
hultonha 0acaac14d8 Merge branch 'main' into hultonha_PR-37_follow-up 2021-04-27 11:39:28 +01:00