birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'development'
${ noResults }
Commit Graph

406 Commits (development)

Author SHA1 Message Date
AMZN-Phil a465bf30a7 Iterate over dependent gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Alex Peterson 4ad6d3e9f7
Updated project manager backgrounds (#5770) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 7e43b53d16 Extra gem download failure handling 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
puvvadar 5aee691cd8 Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 9b2193653b Merge commit 'c375f073395b88ada7b1b5b01ce3142992af97a9' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar ccf208debe Merge commit '95c8398c791a305b33205776c8b7959b263e6f62' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 7bad1f6d46 Merge commit '0d17e575a73f0c16774134d313232ed56eb7e604' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 4 years ago
puvvadar 57428158db Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de 4 years ago
AMZN-Phil 7787ceb04c Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil c375f07339
Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart 
Display Gem Cart in Gem Catalog Right Panel
 4 years ago
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-nggieber 7de4628747
Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber 8d26251c93 Include DownloadController 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
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>
 4 years ago
AMZN-Phil a7e90fd6c8 Fix copy paste variable name 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil ba5102b37d Change to optionally show all python error strings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber dcd50d90c9 Forward declared QVBoxLayout 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber c2308de8ee Added in missed suggestions from previous PR 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 4 years ago
nggieber de67bb70c9 Added comment why GemRepos isn't included in ContainsScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 95da89d0cc Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 4 years ago
AMZN-nggieber 0d17e575a7
Fix: Display Repo Gems on Repo Screen Correctly (#5638) 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 5d2be299d8 Moved includes to forward declarations on GemCatalogScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson fc805594d0
Fixes for misc gem download issues (#5665) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber df36067ef3 Configure gems option added to projects button to go directly to gem catalog 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 1aae84537d Makes project settings screen scrollable 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 4854023eb1
Merge pull request #5592 from aws-lumberyard-dev/Prism/ShowProjectBuildReq 
Store whether O3DE Project Manager built the project successfully
 4 years ago
Tommy Walton ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 4 years ago
nggieber cb5c4256c7 Fix license text eliding 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 7f57548023 Adds triangle under cart button when cart is shown 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 18cf128854 Remove some code duplication 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber 1ed0e09399 Merge branch 'stabilization/2110' into Prism/FixGemCart 4 years ago
nggieber e62af4260b Moves Cart to Right Panel with Gem Inspector 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 07c142b975 Remove temporary changes and remove key before building 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-nggieber 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>
 4 years ago
Alex Peterson c0df1846f4
Create desktop shortcut functionality (#5536) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil bc20208f13 Create file in project directory on successful build for Project Manager 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 0b211d3743
Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI 
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
 4 years ago
nggieber 2b248ac485 Fix merge issue and validation issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
Steve Pham cbe2948ba8
Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang 
Project Manager Fixes for Linux
 4 years ago
nggieber d71196102f More PR feedback changes 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 4 years ago
Steve Pham 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>
 4 years ago
AMZN-Phil 0b6c3382f1 Add an additional comment 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 2913d72d17 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
AMZN-Phil 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>
 4 years ago
nggieber 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>
 4 years ago
AMZN-Phil 541e501b06 Re-add the line to open the cart overlay automatically when a new download starts 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Alex Peterson 461b63c61a
Temporarily disable the platform filter (#5454) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil c7e5a0fe12 Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/clouddownloadicon 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber a253bfc2f5 Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 4 years ago
AMZN-Phil e9c3a453c5
Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 4 years ago
nggieber d5ae98496c Full UI Built for Updating and Uninstalling Gems 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson d053a03b5f
Don't update status filter when filling gem model (#5427) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Tom Hulton-Harrop 5047ba7f7b merge stabilization/2110 to development - 2021/11/09 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 4 years ago
Chris Burel 33d5109fe8
Merge `stabilization/2110` as of `20edb35cdc` into `development` (#5319) 4 years ago
Alex Peterson 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>
 4 years ago
nggieber 14a1206274 Add additional info handling and proper display for gems 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson 0295aa7070 revert change to cancel label href 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 21c02b195f Update signals/slots to match upstream changes 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 4ce39ea167 Fix tags, downloads, and several vector copies 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil c6e77f8e32 Code readability improvements 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 31382d080e Remove duplication, additional readability and added missed file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Alex Peterson c69142b73b Merge branch upstream/stabilization/2110 
* Conflict GemModel.h

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 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>
 4 years ago
AMZN-Phil 393f08fc4b Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/clouddownloadicon 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 9d977e81da Uncomment temporary disabling of toast notifications 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Chris Burel d942c90c56 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
AMZN-nggieber 4721ef8298
License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272) 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Chris Burel 179389726b Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 4 years ago
amzn-sj 9958e5f012 [MacOS] Launching Editor from ProjectManager and other misc. fixes 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 4 years ago
Alex Peterson 774b7c2593 Fixed minor logic issue with gem removal warning 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 2f8de3e797 Keep gem repos pages in sync 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 861b29ffc7 Fix spelling change for member variable 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
amzn-sj 41d3a38781 Add missing header file 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 4 years ago
Alex Peterson 523f2e6465 Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>

# Conflicts:
#	Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
 4 years ago
Alex Peterson 27c7e71516 WIP default gem sorting 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
amzn-sj 9a15b7cadc 1. Fix "Open Editor" button not launching Editor on Mac. 
2. Update LaunchAssetProcessor() paths on Mac.
3. LaunchAssetProcessor() uses ProcessWatcher wrappers.
4. SDK Launcher registers the engine when launching.

Signed-off-by: amzn-sj <srikkant@amazon.com>
 4 years ago
AMZN-Phil 99ef2735b7 Create download UI once and update existing UI with progress 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil a187ee09a1
Merge pull request #5093 from aws-lumberyard-dev/Prism/SearchForGemsFromTags 
Scroll to and Select Gem When Gem Tag is Clicked
 4 years ago
Mike Balfour a40700be2b Merge commit '49da85ca3a4acb633d9c63abcd43f485905aeb92' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 4 years ago
Alex Peterson 49da85ca3a
Fix new project path when enabling gem (#5173) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
nggieber 2ae927c754 Fix minor indent issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson 259ee654ae WIP refresh gem catalog in place 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
nggieber 858e287b1f Removed unused set filter function 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 08255d2eda Clicking tag now select gem and scrolls to it, it also resets filters if gem is filtered out, also gem filter creation was refactored 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson 781eaabd94 Access gem repos from catalog non-destructively 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 07353ed4ad
Merge pull request #5137 from aws-lumberyard-dev/Prism/integrate-crash-fix 
Integrate gem catalog refresh crash fix (#5112)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Esteban Papp 72d6f2972e
Adding support for multi-config/multi-permutation installer 4 years ago
Alex Peterson 65d23c7ed6
Merge pull request #5086 from aws-lumberyard-dev/Prism/RefreshRepoButtonDisablesRepo 
Removed Gem Repo Enable Button
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago