Commit Graph

3694 Commits

Author SHA1 Message Date
AMZN-Phil c375f07339 Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart
Display Gem Cart in Gem Catalog Right Panel
2021-11-17 14:30:43 -08:00
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 14:03:24 -08:00
Danilo Aimini a8dcfbbb13 Prevent settings from being saved to setreg files on editor close. Limiting this to avoid a bigger blast radius. (#5717)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-17 13:27:57 -08:00
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 12:15:57 -08:00
AMZN-Phil 95c8398c79 Merge pull request #5673 from aws-lumberyard-dev/Prism/AddEditGemsButton
Adds Configure Gems Options to Project Dropdown + Misc. Project Manager Fixes
2021-11-17 12:14:24 -08:00
jonawals a1cf76ec65 Merge pull request #5652 from aws-lumberyard-dev/viewport/EditorModeUIBackButton
Viewport/editor mode UI back button
2021-11-17 18:32:46 +00:00
AMZN-nggieber 7de4628747 Merge branch 'stabilization/2110' into Prism/FixGemCart 2021-11-17 10:19:47 -08:00
nggieber 8d26251c93 Include DownloadController
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-17 10:16:41 -08:00
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 10:01:00 -08:00
Qing Tao d0ebe4ee10 Follow up fix for ATOM-13512 (#5689)
* Follow up fix for ATOM-13512
Update the file mask mapping in ImageBuilder.settings.
Change Reflectance.preset to use BC4 format since it only needs once channel.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-17 10:00:31 -08:00
Tom Hulton-Harrop e34ea3bcaa Fixes for viewport selection issues (#5494)
* improvements to editor selection in the viewport

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

* fix issue with being able to select icons that are not showing for entities inside entity containers

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

* update comment after review feedback

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

* updates to viewport picking code to simplify the api

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

* add test to replicate near clip intersection issue

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

* small tidy-up changes

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

* updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up

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

* add some more tests for ViewportInteractionImpl

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

* minor tweaks before PR feedback

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

* fix typo in fix

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

* fix for manipulator test framework tests

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

* updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ

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

* add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors

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

* add PrintTo functions for Screen* types

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

* downgrade error to warning temporarily

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

* check incoming view is null

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

* remove pragma optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 17:12:21 +00:00
Tommy Walton 1e42261d76 Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-17 09:04:04 -08:00
Tom Hulton-Harrop 593f03efb4 Camera fixes follow-up (#5703)
* allow unconstrained camera when tracking transform and fix some camera interpolation issues

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

* tests for interpolation fixes

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

* add test for camera constraints change

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

* updates following review feeedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 16:23:01 +00:00
AMZN-Phil a7e90fd6c8 Fix copy paste variable name
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-17 08:15:41 -08:00
Chris Burel 9f9aa8f2a6 [Linux] Avoid duplicating inotify watches in forked AssetBuilder processes (#5683)
The AssetProcessor on Linux uses `inotify` to monitor for file updates.
The AssetProcessor also uses a `ProcessWatcher` to launch child
AssetBuilder processes. `ProcessWatcher` accomplishes this by calling
`fork()`, which duplicates the current process, then calling `exec()`.
The `fork()` call also appears to duplicate any inotify fds. This
results in the subprocess consuming duplicate inotify watches, which is
a limited system resource (Ubunut 20 defaults
`/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor
still has issues with this max, but this should free up at least half of
the uses.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-17 07:34:56 -08:00
AMZN-AlexOteiza e07cb1f2ed Re-enabled linux tests physics (#5701)
* Re-enabled linux tests physics

* Fix for python load errors on Linux (#5627)

* Explicitly load libpython on Linux

Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag.  This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix misspelled function name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Addressing PR feedback

- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address further feedback

Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
Signed-off-by: aljanru <aljanru@amazon.co.uk>

Co-authored-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-17 14:30:41 +00:00
Tom Hulton-Harrop a6164ca2cd Fix for camera roll behavior when in 'Be this camera' mode (#5658)
* fix for camera roll behavior when in 'Be this camera' mode

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

* updates for camera tests

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

* fix for failing unit test - require default function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-17 12:27:23 +00:00
John 8ee6f1a7f4 Fix back icon scaling.
Signed-off-by: John <jonawals@amazon.com>
2021-11-17 11:08:22 +00:00
AMZN-Phil ba5102b37d Change to optionally show all python error strings
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-16 17:40:12 -08:00
Mike Balfour 551e6010dd Add support for getting the level entity when prefabs are enabled. (#5680)
* Add support for getting the level entity when prefabs are enabled.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Made a little prettier.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Addressed PR feedback plus fixed the crash when the level component failed to add.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-11-16 19:23:53 -06:00
nggieber dcd50d90c9 Forward declared QVBoxLayout
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 17:08:36 -08:00
nggieber c2308de8ee Added in missed suggestions from previous PR
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 16:29:12 -08:00
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 16:04:06 -08:00
nggieber de67bb70c9 Added comment why GemRepos isn't included in ContainsScreen
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 16:01:25 -08:00
nggieber 95da89d0cc Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 15:58:14 -08:00
AMZN-nggieber 0d17e575a7 Fix: Display Repo Gems on Repo Screen Correctly (#5638)
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 15:53:51 -08:00
nggieber 5d2be299d8 Moved includes to forward declarations on GemCatalogScreen
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 15:36:32 -08:00
Qing Tao 2ae8477683 ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild (#5639)
Changes include:
- Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies.
- Change GetSuggestedPreset function so it can return certain preset for certain file name.
- Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used.
- Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch.
- Expose GetFileHash function in AssetBuilderSDK api.


Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-16 15:25:13 -08:00
Alex Peterson fc805594d0 Fixes for misc gem download issues (#5665)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
2021-11-16 14:51:28 -08:00
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-16 14:24:02 -08:00
Tommy Walton 7bf5f86c05 Merging latest development
Signed-off-by: Tommy Walton <waltont@amazon.com>
2021-11-16 13:38:57 -08:00
amzn-phist 6651ae3d78 Fix for python load errors on Linux (#5627)
* Explicitly load libpython on Linux

Downstream loads of python modules that weren't linked to libpython would
fail to load because libraries were loaded using the RTLD_LOCAL flag.  This
adds a function that will explicitly load libpython on Linux using the
RTLD_GLOBAL flag.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix misspelled function name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Addressing PR feedback

- Updates naming and location of things.
- Adds load code to a Gem template.
- Updates error checking.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address further feedback

Removes the api function in favor of just having modules inherit off a
PythonLoader class, that way we get RAAI behavior and lifetime management
for free.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-16 15:32:24 -06:00
nggieber df36067ef3 Configure gems option added to projects button to go directly to gem catalog
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 13:22:52 -08:00
Tommy Walton c2cf9471ba Merge commit 'c3dacb1e5228c05ae146b711c007ee38e4b7ef1c' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:22 -08:00
Tommy Walton 2fd9048f99 Merge commit '5e04ddcc023309ef8e1e43e80867b6cd2b172afc' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:18 -08:00
Tommy Walton 214b47a0d5 Merge commit 'b20a9b5f39b025475d74f166a2634f74b835fdca' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:14 -08:00
Tommy Walton c4810c0ee0 Merge commit 'a5adf33427e3b2163c2f21c75148598b3364d8d4' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:06 -08:00
Tommy Walton 7875600fb0 Merge commit '7031147e324602fb20fcfe2070a942bf9eb4594a' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:55:02 -08:00
Tommy Walton 564bf0c819 Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:46 -08:00
Tommy Walton fa7d7e2ec3 Merge commit 'b3e2c3f075db1f28277c0a35987318449b4eeeb9' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:34 -08:00
nggieber 1aae84537d Makes project settings screen scrollable
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 12:37:20 -08:00
AMZN-Phil 4854023eb1 Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq
Store whether O3DE Project Manager built the project successfully
2021-11-16 12:22:20 -08:00
Vincent Liu 59b12a6ec7 Add cvar for aws log level (#5507)
* Add cvar for aws log level

Signed-off-by: onecent1101 <liug@amazon.com>

* Remove old crysystem registered cmd and add safeguard to get cvar from console

Signed-off-by: onecent1101 <liug@amazon.com>

* Suppress error for client auth unit test as logging was routed to warning before

Signed-off-by: onecent1101 <liug@amazon.com>
2021-11-16 12:14:05 -08:00
Tommy Walton ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:49:26 -08:00
Tommy Walton 14e4fd40d4 Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:49:22 -08:00
Tommy Walton e44fa2a52a Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:19 -08:00
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:11 -08:00
Tommy Walton fc61bce3af Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:59 -08:00
Tommy Walton 4ab3bd487f Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:39 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00