birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,958 Commits 3 Branches 3 Tags
fc8fd89ff9703c100db7572dc0c84adfa7c4db6c
Commit Graph

372 Commits

Author SHA1 Message Date
Alex Peterson fa385ec842 Fix number argument in notifications (#6121) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-03 13:11:23 -08:00
Alex Peterson b3bf2158b4 Right click menu support for project buttons (#6122) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-03 13:10:35 -08:00
AMZN-nggieber 57d688fbc1 Added Tests for Gem Catalog Filtering (#5999) 
* Added Tests for Gem Catalog Filtering

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>

* Addressed PR feedback, Renamed all tests to Osherove naming pattern

Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-01 17:03:36 +01:00
AMZN-nggieber b3bf02a4d5 Adds Warning Dialog When Following an External Link in Project Manager (#6003) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-30 13:13:42 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 11:10:02 -08:00
John 7fa80ee501 Merge commit '99d0c39273fed3742acffa0fafd07038e5ef4b25' into jonawals/gitflow_211125_o3de 2021-11-25 10:22:55 +00:00
lumberyard-employee-dm 99d0c39273 O3DE.exe Project-Centric "Open Editor" fix (#5852) 
* The O3DE.exe Open Editor button now attempts to open the Editor in the
build directory of the project being opened.

If their is no Editor within the build directory of the Project, it uses
the Editor.exe in the current O3DE.exe executable directory if it exists

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Engine .gitignore now ignores the build directory if placed in the
AutomatedTesting project

Previously it was just ignoring a `[Bb]uild` directory if it was
directly within the engine root.
This change matches the behavior of the project templates.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Renamed the ProjectUtils GetEditorDirectory function to
GetEditorExecutablePath

Added a platform specific implementation for retrieving the path to the
Editor executable in the GetEditorExectuablePath function.

It first attempts to locate the Editor via checking the project build
directory for an Editor executable before falling back to checking the
binary directory of the currently running O3DE executable.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correct the MacOS GetEditorExecutablePath to return the Editor path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-23 18:25:00 -06:00
Junbo Liang 2bdee5c9e6 Merge commit 'bf3a5118069d287c013febd94a977966e4d1f944' into junbo/gitflow_211123_o3de 2021-11-23 13:29:23 -08:00
AMZN-Phil d958502f2c Check return value of qputenv 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-22 09:26:34 -08:00
AMZN-Phil c2145a6387 Use QStringList to avoid false matches against a partial path 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-22 08:31:12 -08:00
AMZN-Phil def5b3a65d Fix additional left over references to QProcessEnvironment 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-20 10:37:55 -08:00
AMZN-Phil 74e1ee1862 Fix non-Windows platforms 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-20 10:23:50 -08:00
AMZN-Phil e1b6054ff8 Fix Project Manager not finding CMake on Windows 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-19 19:13:19 -08:00
puvvadar ab58773388 Merge commit '092d125acf2eb23099e08f0d93e9b2a3b90ce016' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:52 -08:00
puvvadar e8cdff627c Merge commit '4ad6d3e9f75880558d4003474621b9ada3aef060' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:31 -08:00
AMZN-Phil 092d125acf Merge pull request #5769 from aws-lumberyard-dev/Prism/RemoteGemWarning 
Extra gem download failure handling
 2021-11-19 07:30:25 -08:00
AMZN-Phil a465bf30a7 Iterate over dependent gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 17:30:52 -08:00
Alex Peterson 4ad6d3e9f7 Updated project manager backgrounds (#5770) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-18 16:54:04 -08:00
AMZN-Phil 7e43b53d16 Extra gem download failure handling 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 15:01:11 -08:00
puvvadar 5aee691cd8 Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:33 -08:00
puvvadar 9b2193653b Merge commit 'c375f073395b88ada7b1b5b01ce3142992af97a9' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:35 -08:00
puvvadar ccf208debe Merge commit '95c8398c791a305b33205776c8b7959b263e6f62' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:17 -08:00
puvvadar 7bad1f6d46 Merge commit '0d17e575a73f0c16774134d313232ed56eb7e604' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:23 -08:00
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:55 -08:00
puvvadar 57428158db Merge commit '4854023eb1d48643e8064265eaa7f3ac775d4360' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:35 -08:00
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>
 2021-11-17 14:43:03 -08:00
AMZN-Phil c375f07339 Merge pull request #5637 from aws-lumberyard-dev/Prism/FixGemCart 
Display Gem Cart in Gem Catalog Right Panel
 2021-11-17 14:30:43 -08:00
AMZN-Phil e9ec37f20b Moved global vector inside PythonBindings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 14:03:24 -08:00
AMZN-nggieber 7de4628747 Merge branch 'stabilization/2110' into Prism/FixGemCart 2021-11-17 10:19:47 -08:00
nggieber 8d26251c93 Include DownloadController 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-17 10:16:41 -08:00
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>
 2021-11-17 10:01:00 -08:00
AMZN-Phil a7e90fd6c8 Fix copy paste variable name 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 08:15:41 -08:00
AMZN-Phil ba5102b37d Change to optionally show all python error strings 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-16 17:40:12 -08:00
nggieber dcd50d90c9 Forward declared QVBoxLayout 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 17:08:36 -08:00
nggieber c2308de8ee Added in missed suggestions from previous PR 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 16:29:12 -08:00
nggieber a3d3423ff7 Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 16:04:06 -08:00
nggieber de67bb70c9 Added comment why GemRepos isn't included in ContainsScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 16:01:25 -08:00
nggieber 95da89d0cc Merge branch 'stabilization/2110' into Prism/AddEditGemsButton 2021-11-16 15:58:14 -08:00
AMZN-nggieber 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
nggieber 5d2be299d8 Moved includes to forward declarations on GemCatalogScreen 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 15:36:32 -08:00
Alex Peterson 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
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-16 14:24:02 -08:00
nggieber df36067ef3 Configure gems option added to projects button to go directly to gem catalog 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 13:22:52 -08:00
nggieber 1aae84537d Makes project settings screen scrollable 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-16 12:37:20 -08:00
AMZN-Phil 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
Tommy Walton ade8183473 Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:49:26 -08:00
Tommy Walton d9eb4fa688 Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:42:11 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00
Tommy Walton 65c3ad6545 Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:22 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00