7bad1f6d46
Merge commit '0d17e575a73f0c16774134d313232ed56eb7e604' into puvvadar/gitflow_211118_o3de
2021-11-18 09:36:23 -08:00
c192a7e3bb
Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de
2021-11-18 09:35:55 -08:00
57428158db
Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de
2021-11-18 09:35:35 -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
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
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
ade8183473
Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:26 -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
18cf128854
Remove some code duplication
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 11:50:28 -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
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
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
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
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
c7e5a0fe12
Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/clouddownloadicon
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-09 11:39:51 -08:00
a253bfc2f5
Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI
2021-11-09 11:36:32 -08:00
e9c3a453c5
Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates
...
Add ability to overwrite o3de object when downloading
2021-11-09 10:41:35 -08:00
d5ae98496c
Full UI Built for Updating and Uninstalling Gems
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-09 10:26:37 -08:00
d053a03b5f
Don't update status filter when filling gem model ( #5427 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-09 09:38:23 -08:00
5047ba7f7b
merge stabilization/2110 to development - 2021/11/09
...
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-09 09:19:54 +00:00
33d5109fe8
Merge stabilization/2110 as of 20edb35cdc into development ( #5319 )
2021-11-08 15:22:17 -08:00
431f80510f
Merge pull request #5414 from aws-lumberyard-dev/Prism/DisplayAddGemInfo
...
Fix Additional Gem Info Handling and Display
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-08 12:20:18 -08:00
14a1206274
Add additional info handling and proper display for gems
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-08 08:17:28 -08:00
0295aa7070
revert change to cancel label href
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:31:01 -07:00
21c02b195f
Update signals/slots to match upstream changes
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:24:08 -07:00
4ce39ea167
Fix tags, downloads, and several vector copies
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-05 17:17:11 -07:00
c6e77f8e32
Code readability improvements
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-05 14:21:10 -07:00
31382d080e
Remove duplication, additional readability and added missed file
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 17:07:02 -07:00
c69142b73b
Merge branch upstream/stabilization/2110
...
* Conflict GemModel.h
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 17:02:00 -07:00
d582715321
Merge pull request #5318 from aws-lumberyard-dev/StablizationMacPMLaunchEditor
...
[MacOS] Launching Editor from ProjectManager and other misc. fixes
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-04 16:46:24 -07:00
393f08fc4b
Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/clouddownloadicon
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:41:59 -07:00
9d977e81da
Uncomment temporary disabling of toast notifications
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-04 15:20:35 -07:00
d942c90c56
Merge branch stabilization/2110 into development
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-11-04 13:44:22 -07:00
puvvadar
AMZN-nggieber
Alex Peterson
AMZN-Phil
Tommy Walton
AMZN-Phil
nggieber
Steve Pham
Nicholas Van Sickle
Tom Hulton-Harrop
Chris Burel