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
95da89d0cc
Merge branch 'stabilization/2110' into Prism/AddEditGemsButton
2021-11-16 15:58:14 -08:00
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
5d2be299d8
Moved includes to forward declarations on GemCatalogScreen
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 15:36:32 -08:00
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
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
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
7bf5f86c05
Merging latest development
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-16 13:38:57 -08:00
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
1aae84537d
Makes project settings screen scrollable
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 12:37:20 -08:00
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
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
ade8183473
Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:26 -08:00
e44fa2a52a
Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:19 -08:00
d9eb4fa688
Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:11 -08:00
6080801c55
Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:35 -08:00
65c3ad6545
Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:22 -08:00
830c10b8b0
Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:18 -08:00
cb5c4256c7
Fix license text eliding
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 10:18:37 -08:00
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
18cf128854
Remove some code duplication
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 11:50:28 -08:00
1ed0e09399
Merge branch 'stabilization/2110' into Prism/FixGemCart
2021-11-15 10:20:36 -08:00
e62af4260b
Moves Cart to Right Panel with Gem Inspector
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-15 10:20:04 -08:00
07c142b975
Remove temporary changes and remove key before building
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 08:51:00 -08:00
76b7e73f6f
Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting ( #5593 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 16:23:04 -08:00
520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
...
Removing references and builders for legacy MTL assets
2021-11-12 13:47:50 -06:00
c0df1846f4
Create desktop shortcut functionality ( #5536 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 11:03:43 -08:00
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06:00
bc20208f13
Create file in project directory on successful build for Project Manager
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-11 14:39:10 -08:00
0b211d3743
Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI
...
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
2021-11-11 14:01:42 -08:00
2b248ac485
Fix merge issue and validation issue
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-11 12:09:24 -08:00
3d21a9f4bd
Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI
2021-11-11 11:52:49 -08:00
cbe2948ba8
Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang
...
Project Manager Fixes for Linux
2021-11-11 11:21:06 -08:00
d71196102f
More PR feedback changes
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-11 10:20:46 -08:00
8d5dd4e35f
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-11-11 10:15:52 -08:00
289d783f25
Fixes for Project Manager on Linux
...
- Fix error with EngineFinder using the wrong path to locate project.json
- Simplified and expanded clang detection
- Remove forcing clang-12 for builds and will rely on the new cmake detection of clang by default
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-11-11 09:41:45 -08:00
c07b666bec
Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes
2021-11-11 08:19:21 -08:00
6e70097ad7
Fixed all errors with default seeds ( #5489 )
...
* Cleaning up errors with default assets, used in bundled release builds
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated simple asset references to be to the product, not source assets
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-11 07:50:25 -08:00
2df8d5b620
Fixed crash if you save a bundle outside the default bundle folder ( #4974 ) ( #5255 )
...
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-11 07:50:16 -08:00
fe5aeb9a5f
Merging latest dev
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-10 19:41:36 -08:00
0b6c3382f1
Add an additional comment
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 16:05:38 -08:00
d9443ec42c
Addressed some PR feedback and continue filtering with same search string even after refresh
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-10 15:29:20 -08:00
2913d72d17
Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI
2021-11-10 12:49:22 -08:00
0bc3e6a18f
Let cart overlay be opened to view downloads even when there are no gems to be added or removed
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 12:33:28 -08:00
f470351d0c
Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-10 12:33:24 -08:00
61d0ec9d6b
Remove debug messages. ( #5429 )
...
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-10 13:22:47 -06:00
e0cc86e898
Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead ( #5216 ) ( #5381 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit b3301414ad
2021-11-10 13:21:42 -06:00
541e501b06
Re-add the line to open the cart overlay automatically when a new download starts
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 10:56:44 -08:00
0102894a83
Handle servers with no content length and make downloading more obvious
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 08:44:24 -08:00
461b63c61a
Temporarily disable the platform filter ( #5454 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-09 14:14:13 -08:00
nggieber
AMZN-nggieber
Qing Tao
Alex Peterson
AMZN-Phil
Tommy Walton
AMZN-Phil
Vincent Liu
Guthrie Adams
Guthrie Adams
Steve Pham
Nicholas Van Sickle
AMZN-stankowi
Gene Walters
amzn-mike