Commit Graph

978 Commits

Author SHA1 Message Date
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
Tommy Walton 2d58d6f544 Merge pull request #314 from aws-lumberyard-dev/Atom/amzn-tommy/ATOM-15281_WrinkleMaskSourceDependency
ATOM-15281 : Add a wildcard source dependecy to the scene builder for wrinklemasks

-Added a wildcard dependency that looks for a subfolder named _wrinklemask, and any files in that folder with the _wrinklemask suffix. This is so that references to _wrinklemask textures that match this naming convention can be found by the MorphTargetExporter, and so that the morph target assets produced by the ModelAssetBuilderComponent will be updated if masks are added or removed.
-Removed a source dependency on .mtl files, which are from the legacy renderer
-Updated a comment about static meshes, which I believe was referring to .cgf files since static meshes now also go through scene builder.
2021-04-28 10:29:01 -07: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
hershey5045 9ffca4df5d [SMC] UI Updates (#270)
* Update SMC prompt texts. Add progress dialog in shader variant generation script. Add "Generate Shader Variant List" command in context menu for shader files in Asset Browser.
2021-04-28 09:56:55 -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
Tom Hulton-Harrop d385189d32 Merge pull request #309 from aws-lumberyard-dev/hultonha_LYN-2772_whitebox-atom
Add Atom default material to White Box Gem
2021-04-28 17:27:07 +01: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
Guthrie Adams 428feb6967 Merge pull request #376 from aws-lumberyard-dev/Atom/guthadam/ATOM-15372
ATOM-15372 Restoring material browser filter logic
2021-04-28 11:00:45 -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
Tom Hulton-Harrop b0b7d027a5 Merge pull request #388 from aws-lumberyard-dev/hultonha_LYN-3368_disable_ap_test
Disabling Asset Processor test causing intermittent failures
2021-04-28 15:53:47 +01: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
karlberg ff3be54b68 This change got clobbered by the file move 2021-04-27 19:31:30 -07:00
karlberg 6bb51bd9e4 Merging latest origin 2021-04-27 19:14:11 -07:00
kberg-amzn 409489e938 Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-04-27 18:59:41 -07:00
jromnoa cac318a30e Merge pull request #381 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-found-crash-now-reenable-tests
SPEC-6522: Re-enable Atom tests in AutomatedTesting.
2021-04-27 18:35:33 -07:00
AMZN-mnaumov a4047baccb Merge pull request #265 from aws-lumberyard-dev/Atom/mnaumov/ATOM-13851
[ATOM-13851] Adding custom title to PropertyAssetCtrl
2021-04-27 17:42:23 -07:00
dmcdiarmid-ly 17d5febda5 Merge pull request #337 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15355
[ATOM-15355] Raytracing mesh transforms are incorrect after initial load
2021-04-27 17:39:51 -07:00
mnaumov 793d60f150 Merge main 2021-04-27 17:07:42 -07:00
jromnoa e1b55d8f0a change property call to the new Atom properties for Decal (Atom) 2021-04-27 16:59:53 -07:00
karlberg a73d25dfe6 One more broken component causing atom tests to crash + some extra PR feedback 2021-04-27 16:54:01 -07:00
guthadam 1d093f9c29 Merge branch 'main' into Atom/guthadam/ATOM-15370 2021-04-27 18:46:26 -05:00
guthadam bd742519fb Merge branch 'main' into Atom/guthadam/ATOM-15372 2021-04-27 18:45:44 -05:00
jromnoa 678a831e51 fix expected lines check for Decal (Atom) to go with the update after finding crash bug 2021-04-27 16:40:53 -07:00
jromnoa 019eacc073 fix Decal component name due to crash in SPEC-6561 2021-04-27 16:38:26 -07:00
Alex Peterson 7aeb9614de Remove remaining libav references 2021-04-27 16:27:10 -07:00
karlberg 618d80e738 Deleting touchpoints with the legacy cry renderer in an attempt to fix a failing test 2021-04-27 16:26:26 -07:00
karlberg 2fc710d73b Addressing PR feedback 2021-04-27 16:03:39 -07:00
dmcdiar ff438688dc Merge branch 'main' into Atom/dmcdiar/ATOM-15355 2021-04-27 16:02:49 -07:00
guthadam 7e8b1e8c80 Fix linux build 2021-04-27 17:57:09 -05:00
carlitosan 78508ec211 Merge pull request #362 from aws-lumberyard-dev/carlitosan-parser-fixes
Carlitosan parser fixes Fixes for branching runtime, nested user branch parse-error, unit tests for both. LYN-3338
2021-04-27 15:52:44 -07: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
guthadam 5593350f84 ATOM-15372 Restoring material browser filter logic
Restoring material browser filter logic to only show folders with content that matches the filter.

This change was originally introduced with the functionality to create a new folder within the material browser.  Creating a new, empty folder would not display the folder in the browser because it did not have any content that matched the filter.  While that makes sense to address the issue with the create folder command, it makes it extremely difficult and navigate the browser to find assets that match the filter because every folder that does not match the filter is also displayed in the tree.  We can revisit issues with the create folder action later.

https://jira.agscollab.com/browse/ATOM-15372
2021-04-27 17:12:42 -05:00
cgalvan 7027bcf7ba Merge pull request #367 from aws-lumberyard-dev/cgalvan/RemoveLegacyPhysicsManager
[LYN-3348] Removed legacy CObjectPhysicsManager.
2021-04-27 17:03:56 -05: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
mnaumov daea5e93b2 Adding groupname to material instance 2021-04-27 14:35:03 -07:00
Vicky e4509dbe68 Merge pull request #322 from aws-lumberyard-dev/Atom/qingtao/ATOM-6088
ATOM-6088 Unified approach to send draws to a single viewport

    Created a template class TagRegistery which implements the previous DrawListTagRegistry. The template is used for both DrawListTagRegistry and DrawFilterTagRegistry
    Added DrawFilterTag to DrawItemKeyPair
    Added DrawFilterMask support in DrawPacket and DrawPacketBuilder
    Added CreateDynamicContext for render pipeline which allows draw to selected render pipeline.
    Updated RasterPass's BuildCommandListInternal function to filter draw items for its owner RenderPipeline.
2021-04-27 14:34:27 -07:00
Chris Galvan 3ad9435eb9 Merge branch 'main' into cgalvan/RemoveLegacyPhysicsManager 2021-04-27 16:27:22 -05:00
chcurran b1fac0a89e Merge branch 'main' into carlitosan-parser-fixes 2021-04-27 14:25:08 -07:00