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

259 Commits (a7f364a5d66cb78f707525c76a8cda1a3b3d009f)

Author SHA1 Message Date
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 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
nggieber 8117798949 Removed gem repo enable button 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson 59c898fc48
Fix notification queue and add gem action (#4985) (#5024) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Danilo Aimini d5c09c695c Merge commit '3165cf283828d1234bda738ab24ea74c4511152a' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
Danilo Aimini b9613bc915 Merge commit '7fc0f14a1b4f66e560a2ee770b9dbb28dfd54d6f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
Danilo Aimini 46d616824f Merge commit '856318005cac14560f765dc5af203e0139344bb3' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
Danilo Aimini 324c9462b6 Merge commit '6b3fc0ff8b2e3094781d7521ec116f620951d46f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 4 years ago
AMZN-Phil 3165cf2838
Merge pull request #5011 from aws-lumberyard-dev/Prism/FixGemSelectedFilter 
Gem Catalog Selected Gems Now Filters For Gems to be Enabled in Current Session
 4 years ago
AMZN-Phil 7fc0f14a1b
Merge pull request #5006 from aws-lumberyard-dev/Prism/FixRemovedProjectStillShown 
Fix Issue When Removed Project is Still Shown if it Was The Last Project
 4 years ago
Alex Peterson 7a0246530a
Fix notification queue and add gem action (#4985) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 856318005c
Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 4 years ago
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson c00b99f2d5
Disable custom titlebar on Mac, Linux, fix resize (#4973) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
AMZN-Phil 423693d16b Re-add call used to initiate gem download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Alex Peterson 29dbb0b089
Set Project Manager minimum height 700px (#4970) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 4 years ago
Esteban Papp fec1b2fda2 Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
 4 years ago
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
AMZN-Phil e8a7743aec
Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 4 years ago
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 4 years ago
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 69771ab2e1
Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress 
Project Manager track progress of, and cancel downloads
 4 years ago
Esteban Papp ec78c1c003 Removes unity=true since its the default 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
AMZN-Phil b609dbbbbb Pass a callback instead of weak linking a module 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
nggieber f6d4556b60 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber 10c0522dcb Added F5 support for refreshing repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
Alex Peterson b536abbf4e
Add existing gem through Project Manager 4 years ago
AMZN-Phil 993baeac7b Add a comment to inform that the process is limited to a single download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
Alex Peterson 1989316cac
Added toast notifications to the gem catalog 4 years ago
nggieber 968c8640d0 Merge branch 'development' into Prism/RefreshGemRepos 4 years ago
nggieber b4a85a2ed6 Repos can be refreshed through Project Manager individually or all at once 
Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-nggieber 54b9ed2737
Added Menu to Gem Catalog with Action to Navigate to Gem Repo Screen (#4829) 
* Added menu to Gem Catalog that with option to navigate to Gem Repo screen

Signed-off-by: nggieber <nggieber@amazon.com>

* Changed Goto to GoTo and added a tr

Signed-off-by: nggieber <nggieber@amazon.com>

* Gem repo button works from new project creation workflow as well and users are warned if they have pending changes in the gem catalog before changing screens.

Signed-off-by: nggieber <nggieber@amazon.com>
 4 years ago
AMZN-Phil 5e6ecddbf9 Remove some test code and extra newlines 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil e3cfcd4cc7 Add the ability for Python to pass download progress to Project Manager and to cancel downloads. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil 24d7a90e5f Fix a warning 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago
AMZN-Phil a032c59eab Removing unused function 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 4 years ago