Commit Graph

4232 Commits

Author SHA1 Message Date
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
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:22 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00
nggieber cb5c4256c7 Fix license text eliding
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-16 10:18:37 -08:00
santorac db3d41ad9d Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-16 10:06:28 -08:00
John 4d6e7f7ef9 Address PR comments.
Signed-off-by: John <jonawals@amazon.com>
2021-11-16 17:59:18 +00:00
John 921612594a Add placeholder icon for back button.
Signed-off-by: John <jonawals@amazon.com>
2021-11-16 17:54:19 +00:00
Chris Galvan 3428bcb5da Updated splash screen and about dialog with development name
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-16 10:07:45 -06:00
AMZN-stankowi c3dacb1e52 Unlocked a mutex after modifying the associated variable (#5625)
* Unlocked a mutex after modifying the variable the mutex was meant for.
This fixes an issue where mounting bundles in the Editor was causing the Editor to freeze up, because the following line, m_levelOpenEvent.Signal, resulted in another attempt to lock that same mutex.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Added a comment describing why the unlock is necessary.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-11-16 08:07:20 -08:00
Chris Galvan 83df483813 Updated splash screen and about dialog with Stable 21.11 name
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-16 10:05:48 -06:00
John 1546247922 Trivial refactor of comments.
Signed-off-by: John <jonawals@amazon.com>
2021-11-16 16:02:22 +00:00
John f369fcb3d1 Merge remote-tracking branch 'origin/stabilization/2110' into viewport/EditorModeUIBackButton 2021-11-16 15:56:53 +00:00
John 6b201bf97c Add back button to editor mode UI.
Signed-off-by: John <jonawals@amazon.com>
2021-11-16 15:55:22 +00:00
Chris Galvan 5e04ddcc02 Merge pull request #5647 from aws-lumberyard-dev/cgalvan/UpdateSplashScreenName
Updated splash screen and about dialog with Stable 21.11 name
2021-11-16 09:34:22 -06:00
bosnichd b20a9b5f39 Some modifications required for restricted platforms: (#5624)
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-11-16 08:27:32 -07:00
Chris Galvan ce10906671 Updated splash screen and about dialog with Stable 21.11 name
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-16 08:08:53 -06:00
AMZN-Igarri a5adf33427 Deactivate new Asset Picker View by default in the Editor (#5614)
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
2021-11-16 10:47:02 +00:00
nggieber 7f57548023 Adds triangle under cart button when cart is shown
Signed-off-by: nggieber <nggieber@amazon.com>
2021-11-15 20:00:20 -08:00
santorac 7d849cc0d2 Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-15 16:51:22 -08:00
Chris Galvan 7031147e32 Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. (#5623)
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-15 17:01:47 -06:00
amzn-mike 8b7e538dd3 Cherry Pick: [LYN-7463] Fix insert streaming request failure (#5604) (#5622)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 0cea59d669)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-15 14:14:43 -08:00
Gene Walters e1ace4a8f6 WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this...
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-15 12:37:52 -08:00
Gene Walters 4d161f42df WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this...
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-15 12:37:21 -08:00
amzn-mike 63713ca284 Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-15 12:23:56 -08:00
amzn-sj fc547d902c Add message to indicate Json serialization of bitset is not supported (#5590)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-11-15 14:09:43 -06:00
AMZN-Phil 18cf128854 Remove some code duplication
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-15 11:50:28 -08:00
amzn-mike 0cea59d669 [LYN-7463] Fix insert streaming request failure (#5604)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-11-15 11:28:06 -08:00