Commit Graph

8373 Commits

Author SHA1 Message Date
moraaar e553eb0116 Fixed editor crash dropping an fbx to entity inspector (#5242)
The issue was that EditorActorComponent (added by the drag and drop of the FBX into the entity) continued with the loading of an actor asset even though the component is not activated due to incompatible services, which ultimately lead to logic which should never have been reached and crashing.

Also fixed EditorActorComponent missing activation and deactivation of the base editor component class, which is necessary.

All tests from EMotionFX.Editor.Tests passed.

Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-04 09:27:23 +00:00
Tom Hulton-Harrop 4c41a4dfc9 Ensure ImGui menu is displayed when the Viewport UI viewport border is showing (#5240)
* add optimize off code temporarily

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* ensure the imgui menu displays when the viewport border is active

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-04 09:16:27 +00:00
Chris Burel d598a7c709 [Linux] Update Jenkins Linux build to use Ubuntu 20, clang 12 (#5035)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-03 18:54:37 -05:00
Chris Galvan 803aac9169 Merge pull request #5250 from aws-lumberyard-dev/cgalvan/PythonToolTemplateEnableQuickIteration
Add quick iteration workflow to the custom python tool template.
2021-11-03 14:16:29 -05:00
Danilo Aimini 618777f8d4 LYN-7536 | Focus Mode - Introduce shortcuts to open/close prefab editing (#5230)
* Enable closing prefab by double-clicking it when it's in focus.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Enable double clicking on level prefab to close focus mode and return to editing the level.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce API function to go up one level in the Prefab Focus Mode hierarchy.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Enable keyboard shortcuts to more easily navigate the prefab hierarchy.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Tie the "Open/Edit Prefab" action to the = key on top of +. This allows users with compact US keyboards to use either key, preventing them from having to press Shift and =.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Replace the behavior of the "Up one level" button in the breadcrumbs with the new function that serves the same purpose. Also show the - shortcut in the tooltip.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix FocusOnParentOfFocusedPrefab to require the entity context id (to conform with the other functions in the API that don't pass entityIds). Expand its usage to other functions that did the same operation manually.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Include fix for non-unity builds

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-03 11:15:11 -07:00
Chris Galvan b56783dce0 Add quick iteration workflow to the custom python tool template.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-03 11:28:42 -05:00
Esteban Papp 520aeb60a6 Fixes SDK mix between monolithic and non-monolithic 2021-11-03 09:15:41 -07:00
antonmic 5a0b6314e4 Merge pull request #5223 from aws-lumberyard-dev/atom/antonmic/removeUnusedSsaoPass
Removed unused SsaoHalfRes pass
2021-11-02 22:21:15 -07:00
antonmic 4e9b9067e0 merging to re-try failed AR
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-02 17:17:56 -07:00
Esteban Papp a433b9e8dd Making paths consistent (PR comment)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 17:05:14 -07:00
Esteban Papp 3334f5eb91 Fix paths to BuildInPackages and o3de_subdirectories
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 16:36:02 -07:00
santorac cda87abe6b Merge pull request #5121 from aws-lumberyard-dev/Atom/santorac/FixChickenMohawkMaterial
Fixed the chicken mohawk material to address depth sorting issues.
2021-11-02 16:27:21 -07:00
Danilo Aimini 4e2c28105c LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193) (#5220)
* Disable drag&drop of entities on closed containers.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Do not show the Create Entity context menu when right clicking a closed prefab container.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable entity creation on closed containers, both via the Create Entity flow and drag/drop of assets.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor changes to modernize old code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-02 15:32:51 -07:00
Esteban Papp c9f4600bf3 Fixes SDK mix between monolithic and non-monolithic
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-02 15:13:18 -07:00
antonmic 0900f5075f Removed unused SsaoHalfRes pass
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2021-11-02 14:40:18 -07:00
galibzon 6763e2a3ac Shaders changes require two or more change cycles before updating (#5142)
* Shaders changes require two or more change cycles before updating

This fixes the problem described in the title.

Consolidated the responsibility to update the root shader variant
asset into the Shader() class. It was unnecessarily spread across
Shader(), ShaderVariant() and ShaderAsset().
In particular OnAssetReloaded now makes a temporary copy of the root
ShaderVariantAsset and updates the ShaderAsset with such reference
only when OnAssetReloaded() is called on behalf of the ShaderAsset.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2021-11-02 16:21:26 -05:00
santorac a3d018f30f Merge branch 'stabilization/2110' into Atom/santorac/FixChickenMohawkMaterial 2021-11-02 13:46:52 -07:00
Tommy Walton f8aa265253 Modifying a copy to not overrun if the target is smaller than the size of the default value array (#5186)
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-02 13:42:20 -07:00
Tommy Walton fab0326188 Creating default seedList.seed files for Atom gems (#5147)
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-02 13:42:11 -07:00
dmcdiarmid-ly 1d106c0c8d Merge pull request #5196 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16056
ReflectionProbe cubemap visual quality improvements
2021-11-02 12:38:08 -07:00
Mikhail Naumov 22b21acc97 No longer can create camera in an empty level (#5189)
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-11-02 12:24:14 -07:00
Jeremy Ong 47b7ad1ec4 Merge pull request #5018 from aws-lumberyard-dev/burelc/linuxApTetherLifetime
[Linux] Terminate AssetProcessor when spawned by the parent project process
2021-11-02 11:08:47 -06:00
lumberyard-employee-dm a9f7ab4aaf Fixed the return value of the ConvertToAbsolutePath function (#5195)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-02 11:48:09 -05:00
bosnichd 403e2ff1e3 Fix bug in LocalFileIO::ConvertToAliasBuffer when a resolved alias ends in a path separator. (#5136)
* Fix bug in LocalFileIO::ConvertToAliasBuffer when a resolved alias ends in a path separator, in which case we do not want to consume it when replacing it with the alias.

eg. If the @products@ alias resolves to "C:\" and we call ConvertToAliasBuffer with "C:\some_folder\some_file.txt", the current behaviour results in "@products@some_folder\some_file.txt", but it needs to be "@products@\some_folder\some_file.txt"

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Update based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-02 10:31:50 -06:00
Mike Balfour d106c9aba5 Merge pull request #5174 from aws-lumberyard-dev/Prefab/RevertImmediatePropagation
Prefab/revert immediate propagation
2021-11-02 10:59:17 -05:00
AMZN-Phil a187ee09a1 Merge pull request #5093 from aws-lumberyard-dev/Prism/SearchForGemsFromTags
Scroll to and Select Gem When Gem Tag is Clicked
2021-11-02 08:27:13 -07:00
Ken Pruiksma d52ce49dcb Terrain macro material fixes (#5182)
* Minor fixes for macro materials
- When macro image views are no longer used, they will explicitely be set to nullptr
- limiting for loop in shader to the number of macro materials total so it doesn't read unitialized memory

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Removing parts of the terrain shader no longer used.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixing normalization in shaders, adding default valus for all structs used in SRGs.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-11-02 09:27:10 -05:00
moraaar 0ccd55f945 Added PAL to blast and whitebox tests to only enable automated tests on supported platforms: windows only at the moment. (#5165)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-02 09:28:31 +00:00
hultonha de6af361ab Do not clear input channels everytime focus changes (#5044)
* remove HandleFocusChange from FocusIn/Out events in QtEventToAzInputManager

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure we clear input channels when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* wip changes for focus switching tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to test to verify focus change not affecting input

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to ensure input is not cleared when focus changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure key press goes to correct widget

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to verify input is cleared when application state changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* clear input for all types of application state change

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update input key for focus test

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* use the Settings Registry to tell the InputSystemComponent to disable various devices

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update how we simulate the application state change event

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* revert Settings Registry changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-11-02 09:19:06 +00:00
hultonha bf6fd2a6d6 Add missing reflection calls for various types (#5163)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-11-02 09:18:42 +00:00
dmcdiar b744734719 Merge branch 'stabilization/2110' into Atom/dmcdiar/ATOM-16056 2021-11-01 21:18:33 -07:00
dmcdiar 05c374768e Added missing passes to the ReflectionProbe baking pipeline
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-11-01 20:13:00 -07:00
Alex Peterson 49da85ca3a Fix new project path when enabling gem (#5173)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-01 16:07:57 -07:00
Allen Jackson 8b5a0350b5 {lyn7621} adding more time via ap_max_activate_time (#5180)
* adding more time via ap_max_activate_time so that the Debug
  version of AP-GUI can load all the builder DLLs

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-11-01 17:27:17 -05:00
Chris Burel 08c51aaf27 [Linux] Terminate AssetProcessor when spawned by the parent project process
This adds support for the `ap_tether_lifetime` cvar in Linux. It extends
the solution implemented in #2799 to add the same support on Linux.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-01 14:56:24 -07:00
nggieber 2ae927c754 Fix minor indent issue
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-01 14:47:27 -07:00
Chris Burel 8f56dc10c3 Perform sse float comparisons with the floating-point intrinsics (#5115)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-01 16:11:34 -04:00
Danilo Aimini d948d78b2e Merge pull request #5170 from aws-lumberyard-dev/daimini/cherrypick/outlinerEntityOrderingFix
Cherry-pick: resolve entity ordering for EntityOutliner
2021-11-01 12:41:58 -07:00
Guthrie Adams ecd11a441c Merge pull request #5152 from aws-lumberyard-dev/Atom/guthadam/material_component_json_serializer
Created custom JSON serializer for editor material component
2021-11-01 13:56:35 -05:00
Chris Galvan c183764379 Merge pull request #5169 from aws-lumberyard-dev/cgalvan/PythonToolGemplateGitignore
Added .gitignore for __pycache__ and pyc files to the python tool gemplate
2021-11-01 13:51:48 -05:00
srikappa-amzn f7a48fda11 Added a missing function comment for UpdatePrefabInstances function
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-11-01 11:41:05 -07:00
srikappa-amzn 729a79dc82 Revert "Fixing undo/redo not updating transform pivot point (#4375)"
This reverts commit 7018f16088.

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-11-01 11:39:04 -07:00
srikappa-amzn 1025eb3929 Revert "Delay propagation for all template updates in detach prefab workflow (#4707)"
This reverts commit 87533d80c1.

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
2021-11-01 11:39:01 -07:00
Guthrie Adams 1228738bb2 Merge pull request #5166 from aws-lumberyard-dev/Atom/guthadam/moving_script_asset_registration_to_script_system_component
Removing redundant registration of script assets
2021-11-01 13:20:34 -05:00
Michael Pollind 9886603f99 Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938)
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-11-01 10:35:32 -07:00
Chris Galvan 7ac69c51db Added .gitignore for __pycache__ and pyc files to the python tool gemplate.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-01 11:49:19 -05:00
Guthrie Adams 7ba7928559 Removing redundant registration of script assets
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-01 11:19:08 -05:00
AMZN-Igarri d3ff91f153 Fixed memory leak of the in the AssetBrowserComponent (#5132)
Signed-off-by: igarri <igarri@amazon.com>
2021-11-01 12:16:00 +00:00
hultonha cf767fd4bd Fix for 'focus' text appearing incorrectly (#5133)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-11-01 09:33:38 +00:00
Guthrie Adams 68cb8792f7 fix header comments
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-10-31 15:12:27 -05:00