Commit Graph

2270 Commits

Author SHA1 Message Date
sharmajs-amzn 3aa6969d19 disabling rccontrollertest (#874) 2021-05-25 11:13:29 -07:00
Mike Balfour 0be75732cc Added initial support for nested slices to slice-prefab converter (#881)
Nested slices are now detected, converted into prefabs, and the top-level prefab will get linked to the nested prefabs with the proper number of instances.  However, the nested prefabs won't retain any of the slice override values or parent entity hierarchy.  That will (hopefully) be added in a separate PR.

This also adds support for better relative source paths for nested prefabs.  To support this, the tool now needs to connect/disconnect with the AssetProcessor to be able to turn a slice asset ID into a relative source path, so that nested templates can be looked up and converted correctly.
2021-05-25 12:44:34 -05:00
AMZN-nggieber 1d50d7ed64 Project Manager Projects Screen Dynamically Shows Projects Loaded from O3DE (#873)
* Projects Home Screen Dynamically displays Projects from O3DE and can open Project settings editor

* Seperated out CreateProjectCtrl and UpdateProjectCtrl

* Moved source level statics back into class headers

* Updated background image location
2021-05-25 10:16:11 -07:00
Terry Michaels ad3625c2a2 Added ability to specify a default directory for the asset picker in the asset property control (#903)
* Framework for setting default directory in asset picker

* Asset Picker will default to a passed in default directory in the selection model

* Added comment to the property to help define what is expected.

* Fixed string assignment

* Removed commented out #pragma

* Addressed review feedback

* Addressed review feedback
2021-05-25 11:57:49 -05:00
Tom Hulton-Harrop 50f5976e59 Rename and move ModernViewportCameraController (#866)
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework

* update names and includes after file moves
2021-05-25 17:28:51 +01:00
Scott Romero e765a43eda [main] fixes #871 - external project configure failure
Merge pull request #895 from aws-lumberyard-dev/ext_project_packaging_fix
2021-05-25 09:26:21 -07:00
AMZN-stankowi 1da8c50e8e Temporarily backing out STL changes to unblock mainline (#921)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.
2021-05-25 08:54:42 -07:00
sphrose d15cbdbbc8 Merge pull request #865 from aws-lumberyard-dev/LYN-2139
LYN-2139 UX: Goto Position modal is unnecessarily massive
2021-05-25 08:15:14 +01:00
Benjamin Jillich 36c23b5d1a [LYN-2522] Filtering for gem catalog (#867)
* Added sort filter proxy model for gem model that can filter based on name, gem origin, supported platform, features and/or types.
* Added new filter pane on the left with several filter categories for gem origin, type, platform and feature.
* Added filter category widget which is a collapsable generalized checkbox group that can interact with the proxy model and thus control filtering.
* Removed fixed size of the project manager. The application should always be resizable.
2021-05-25 07:17:23 +02:00
balibhan 8d7a1130d0 Merge pull request #893 from aws-lumberyard-dev/sc_automation_balibhan2
Add/Remove Methods from scriptevents
2021-05-25 10:21:53 +05:30
AMZN-mnaumov 5788c379bb Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
2021-05-24 21:51:33 -07:00
mnaumov 78451c5898 PR feedback 2021-05-24 17:34:04 -07:00
rgba16f d4bad61f9a DebugDraw gem fixes for Atom (#885)
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API

* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.

Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.

* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI

Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location

* Cleanup some unused or commented code

* Update with PR feedback from Nick Van Sickle
2021-05-24 16:49:00 -05:00
SergeyAMZN 503848632c Merge pull request #901 from aws-lumberyard-dev/MultiplayerPipeline
SPEC-6984 Fixed flaky test when user settings were written by Compone…
2021-05-24 22:06:20 +01:00
AMZN-mnaumov 26a1b96380 Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463
[ATOM-15463] Adjusting combo box width
2021-05-24 12:03:37 -07:00
pereslav 43ffb2c872 SPEC-6984 Fixed flaky test when user settings were written by ComponentApplication 2021-05-24 19:51:16 +01:00
cgalvan 006219512e Merge pull request #896 from aws-lumberyard-dev/cgalvan/FixAddInvalidComponent
[SPEC-6561] Prevent Editor crash when using the hydra_editor_utils to create an Entity with an invalid component.
2021-05-24 13:36:18 -05:00
AMZN-mnaumov 87c6fa3884 Merge pull request #889 from aws-lumberyard-dev/Atom/mnaumov/Atom-15550
[ATOM-15550] Asset hint displays product name instead of source name
2021-05-24 11:29:54 -07:00
jromnoa be9172b12c Merge pull request #854 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6957-fix-atom-renderer-test-timeout-issue
SPEC-6957: Attempting to fix the atom tests that only fail in AR but pass 100% of the time locally.
2021-05-24 10:55:31 -07:00
AMZN-stankowi b37be6cdbf New AssImp build, just for Windows. This has the crash fix with bones. (#875) 2021-05-24 10:41:19 -07:00
Guthrie Adams 002e2c64ff Merge pull request #894 from aws-lumberyard-dev/Atom/guthadam/ATOM-15612
ATOM-15612 fix material editor crash when group doesn't exist
2021-05-24 12:21:51 -05:00
Chris Galvan 860f13c0ff [SPEC-6561] Prevent Editor crash when using the hydra_editor_utils to create an Entity with an invalid component. 2021-05-24 12:14:58 -05:00
Tommy Walton 838202873a Fix for ATOM-15595 : OctreeNode silently evicts entries that are larger than the size of the root node (#870)
- Fixed a bug where an entry would get removed from the octree when being updated if it was too large to be fully contained by the root node (the desired behavior is that it just lives in the root node)
- Added a unit test to ensure that large entries can exist in the root node
- Updated the unit tests to manually count the number of entries instead of relying on GetEntryCount, since GetEntryCount was reporting an unreliable count before this bug was fixed.
2021-05-24 10:10:50 -07:00
AMZN-stankowi 58adcf168f FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)
* FBX settings can be opened again: g_fbxImporter is set, and if the extension list is empty, it is reloaded.

* auto -> auto*, .size() == 0 -> .empty()
2021-05-24 10:05:12 -07:00
scottr 26c55514d5 [ext_project_packaging_fix] replaced incorrect usage of CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR in cmake packaging scripts 2021-05-24 09:27:03 -07:00
moudgils aeaa3a9c55 Merge pull request #884 from aws-lumberyard-dev/SpirvCrossUpdate
Spirv cross update
2021-05-24 09:17:27 -07:00
jckand-amzn 69d4e7d759 Merge pull request #882 from aws-lumberyard-dev/jckand/FoundationAuto
LYN-3769: Adding a basic Editor workflow automated test
2021-05-24 11:05:20 -05:00
guthadam a05b131cc8 ATOM-15612 fix material editor crash when group doesn't exist 2021-05-24 10:39:55 -05:00
sphrose 576356684b Merge branch 'main' into LYN-2139 2021-05-24 16:32:39 +01:00
jckand-amzn e9f8ced903 Merge branch 'main' into jckand/FoundationAuto 2021-05-24 10:06:09 -05:00
Mike Balfour 4c239a105b [LYN-3548] Change IMGUI to use list of levels with prefab LoadLevel instead of text box
There was an intermittent crash related to garbage in the level name box with prefabs, possibly due to levelName being uninitialized. This change improves the UX by listing out all the possible choices, instead of making people type it in.
2021-05-24 08:55:46 -05:00
balibhan d615441bbf updated summary 2021-05-24 12:30:17 +05:30
balibhan f8d320e79a updated with new line 2021-05-24 11:29:12 +05:30
balibhan 41b2f0d522 Merge branch 'main' into sc_automation_balibhan2 2021-05-24 11:24:21 +05:30
balibhan 265e57cd07 Add remove method Asset Editor 2021-05-24 11:20:48 +05:30
Anton Michels 5d03be5ed1 Merge pull request #891 from aws-lumberyard-dev/Atom/antonmic/ImGuiPassFix
LYN-3947 Fix for command line issues
2021-05-22 23:18:19 -07:00
antonmic 0b9e98c50e Fix for potential lighting pass crash with uninitialized pipeline 2021-05-22 00:27:06 -07:00
Alex Peterson d112ae403b Engine settings UX update and basic functionality 2021-05-21 22:47:41 -07:00
antonmic 6388277cd1 Fixed ImGui Pass as well as how exposure pass enables itself 2021-05-21 21:20:08 -07:00
mnaumov 6ee8c6daa5 [ATOM-15538] Material Editor camera zoom speed adjusts to model size 2021-05-21 20:34:42 -07:00
mnaumov ff2a6c3acd Asset hint displays product name instead of source name 2021-05-21 20:14:30 -07:00
mnaumov 5c18c6ee47 Adjusting combo box width 2021-05-21 19:54:13 -07:00
Qing Tao d20f3d8bd4 SPEC-6960 Android & Windows asset jobs have failing assets preventing the new ASV code submission gate from passing.
Use AZ::u64 instead of uint64_t to avoid issue that PRIu64 won't match uint64_t in some cases
2021-05-21 16:38:20 -07:00
evanchia-ly-sdets 6e13d384a1 Merge pull request #876 from aws-lumberyard-dev/test_metrics_url
adding explicit url for test metrics
2021-05-21 16:13:50 -07:00
moudgils a1cb7cd593 Add windows package 2021-05-21 15:36:06 -07:00
mbalfour 6fa78218d2 [LYN-3548] Change IMGUI to use list of levels with prefab LoadLevel instead of text box
There was an intermittent crash related to garbage in the level name box with prefabs, possibly due to levelName being uninitialized.  This change improves the UX by listing out all the possible choices, instead of making people type it in.
2021-05-21 17:32:55 -05:00
Gene Walters 804258ea11 Merge pull request #862 from aws-lumberyard-dev/SPEC6477_ScriptNetworkContext
Moved network context methods out of MultiplayerComponent into NetBindingComponent
2021-05-21 15:10:52 -07:00
Ken Pruiksma 31122044d3 Merge pull request #877 from aws-lumberyard-dev/pruiksma/halton
Halton sequence added to AzCore/Math/Random.h with unit tests.
2021-05-21 16:57:23 -05:00
jckand-amzn 434fef4b8f Adding missing copyright header to test file 2021-05-21 16:39:16 -05:00
jckand-amzn 053247931b LYN-3769: Adding a basic Editor workflow automated test 2021-05-21 15:45:46 -05:00