birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,169 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 '6eddf084aa'
${ noResults }
Commit Graph

298 Commits (6eddf084aa2ea79e281a656afff9a4e60dcc0d4b)

Author SHA1 Message Date
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
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
AMZN-Phil e9c3a453c5
Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 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
Alex Peterson ca9093c202 Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 5db6ffb6f3
Disable custom titlebar on Mac, Linux, fix resize (#4973) (#5114) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson b4dd4c8f02
Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 4 years ago
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 4 years ago
Alex Peterson 6cce184340
Enforce unique gem names in catalog (#5063) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Alex Peterson 00a49fa251
Use source model data instead of filtered (#5071) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago