birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,875 Commits 3 Branches 3 Tags
5f7aee081433f59c4ae75ee33fa00e3078036287
Commit Graph

272 Commits

Author SHA1 Message Date
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00
Chris Burel d942c90c56 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:44:22 -07:00
AMZN-nggieber 4721ef8298 License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272) 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-04 13:04:06 -07:00
Chris Burel 179389726b Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 11:10:23 -07:00
amzn-sj 41d3a38781 Add missing header file 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-03 12:42:22 -07:00
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>
 2021-11-03 11:18:57 -07:00
AMZN-Phil a187ee09a1 Merge pull request #5093 from aws-lumberyard-dev/Prism/SearchForGemsFromTags 
Scroll to and Select Gem When Gem Tag is Clicked
 2021-11-02 08:27:13 -07:00
Mike Balfour a40700be2b Merge commit '49da85ca3a4acb633d9c63abcd43f485905aeb92' into mbalfour/gitflow_211102_o3de 2021-11-02 09:38:40 -05:00
Mike Balfour a7f364a5d6 Merge commit '65d23c7ed6b084ad58d03fb46e76793cac41d503' into mbalfour/gitflow_211102_o3de 2021-11-02 09:37:43 -05:00
Alex Peterson 49da85ca3a Fix new project path when enabling gem (#5173) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-01 16:07:57 -07:00
nggieber 2ae927c754 Fix minor indent issue 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-01 14:47:27 -07:00
nggieber 858e287b1f Removed unused set filter function 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-29 13:37:58 -07:00
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>
 2021-10-29 13:20:11 -07:00
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>
 2021-10-29 12:03:34 -07:00
Esteban Papp 72d6f2972e Adding support for multi-config/multi-permutation installer 2021-10-29 10:46:28 -07:00
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>
 2021-10-29 10:38:11 -07:00
Alex Peterson ca9093c202 Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-29 10:19:33 -07:00
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>
 2021-10-29 09:21:20 -07:00
Alex Peterson b4dd4c8f02 Add engine name, folder and fix refresh crash (#5112) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-29 09:20:52 -07:00
Esteban Papp 475338cfad Merge branch 'development' into o3de_sdk/installer_configs 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-28 18:29:52 -07:00
Adi Bar-Lev 2a32d67830 Merge commit '6cce184340dbce9796234a67a0452d1088474945' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:53 -04:00
Adi Bar-Lev 1488522236 Merge commit '00a49fa251121eeb13d28a5ff3cc466392ed3ad9' into barlev/gitflow_211028_O3DE 2021-10-28 20:06:42 -04:00
Alex Peterson 6cce184340 Enforce unique gem names in catalog (#5063) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-28 14:33:24 -07:00
Alex Peterson 00a49fa251 Use source model data instead of filtered (#5071) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-28 12:53:54 -07:00
nggieber 37243c74ec Make gem tags clickable and filter by their text in the Gem Catalog when clicked 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-28 09:21:56 -07:00
nggieber 8117798949 Removed gem repo enable button 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-28 07:00:21 -07:00
Alex Peterson 59c898fc48 Fix notification queue and add gem action (#4985) (#5024) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-27 13:55:32 -07:00
Danilo Aimini d5c09c695c Merge commit '3165cf283828d1234bda738ab24ea74c4511152a' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:23:12 -07:00
Danilo Aimini b9613bc915 Merge commit '7fc0f14a1b4f66e560a2ee770b9dbb28dfd54d6f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:23:07 -07:00
Danilo Aimini 46d616824f Merge commit '856318005cac14560f765dc5af203e0139344bb3' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:22:30 -07:00
Danilo Aimini 324c9462b6 Merge commit '6b3fc0ff8b2e3094781d7521ec116f620951d46f' into daimini/gitflow_211027_o3de 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-27 11:21:46 -07:00
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
 2021-10-27 09:28:16 -07:00
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
 2021-10-27 09:28:06 -07:00
Alex Peterson 7a0246530a Fix notification queue and add gem action (#4985) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-26 14:37:47 -07:00
AMZN-Phil 856318005c Merge pull request #5000 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Adds Warning to Add Repo Dialog
 2021-10-26 11:01:02 -07:00
nggieber 866fd8a420 Fix selected gem filtering 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 09:46:54 -07:00
nggieber 3ff469c55e Fix issue with project still displaying when last project is removed 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 08:42:22 -07:00
nggieber 75ebf77b59 Added warning message when adding repositories 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-26 07:22:47 -07:00
Alex Peterson c00b99f2d5 Disable custom titlebar on Mac, Linux, fix resize (#4973) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-25 16:33:32 -07:00
AMZN-Phil 423693d16b Re-add call used to initiate gem download 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 16:05:19 -07:00
Alex Peterson 29dbb0b089 Set Project Manager minimum height 700px (#4970) 
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-10-25 14:57:53 -07:00
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
 2021-10-25 12:47:36 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:19:54 -07:00
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:30:02 -07:00
nggieber 673815c58d Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:23:17 -07:00
nggieber 15f4c1a091 Undownloaded remote gems are shown in Gem Catalog and searchable by repo name 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:22:16 -07:00
AMZN-Phil 69771ab2e1 Merge pull request #4892 from aws-lumberyard-dev/TrackDownloadProgress 
Project Manager track progress of, and cancel downloads
 2021-10-22 15:53:29 -07:00
Esteban Papp ec78c1c003 Removes unity=true since its the default 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-22 15:31:46 -07:00