Commit Graph

995 Commits

Author SHA1 Message Date
pappeste 4630c82df0 Preventing certain projects from showing up in the project's solution 2021-04-28 14:05:36 -07:00
cgalvan f1c5d4c801 Merge pull request #396 from aws-lumberyard-dev/cgalvan/RemoveNewViewportCryEngineChecks
[LYN-3374] Removed Cry3DEngine checks in EditorViewportWidget that was preventing selection, correct camera position, and other issues in the viewport.
2021-04-28 14:18:27 -05:00
Shirang Jia e0f8066a97 Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes (#380)
Add AttachDate tag to EBS volume and add script to find/delete inactive EBS volumes
2021-04-28 12:11:15 -07:00
Vincent Liu 9f9b8f70b4 [LYN-3149] Update AWSCore Editor menu to invoke resource mapping tool through engine python environment (#318)
## Details
After migrating to engine python environment, there is no extra step required to launch resource mapping tool in editor.
1. This change is to migrate the editor tool launching process to engine python environment.
2. Add messagebox to show errors while using the tool
3. Note - as Qt binaries are not well organized in build directory, so separate out *AWSCore.ResourceMappintTool* target to group Qt binaries into independent build sub folder to solve the issue (temporarily, fix can be tracked by https://jira.agscollab.com/browse/LYN-2669, once fix is done, we can just remove this individual target)

## Testing
Runs AWSCore.Editor.Tests
```
[----------] Global test environment tear-down
[==========] 8 tests from 4 test cases ran. (161 ms total)
[  PASSED  ] 8 tests.
```
2021-04-28 11:28:23 -07:00
Luis Sempé ac78bb38e5 Merge pull request #377 from aws-lumberyard-dev/scripting/bug_fixes
Removing the ScriptCanvasDiagnosticsLibrary gem
2021-04-28 11:22:51 -07:00
Chris Galvan 67e64f8a95 [LYN-3374] Removed Cry3DEngine checks in EditorViewportWidget that was preventing selection, correct camera position, and other issues in the viewport. 2021-04-28 12:53:10 -05: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 3c8421036a Merge pull request #389 from aws-lumberyard-dev/Atom/guthadam/ATOM-15371
ATOM-15371 Adding missing RHI dependency to Atom tools
2021-04-28 12:35:21 -05: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
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
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
guthadam 33749519db ATOM-15371 Adding missing RHI dependency to Atom tools
This was causing error message spam and possibly other issues when launching the tools.

https://jira.agscollab.com/browse/ATOM-15371
2021-04-28 11:10:55 -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
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 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
luissemp 12a3fe8738 Removed gem entry from CMakeLists.txt 2021-04-27 17:48:31 -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