Junbo Liang
|
2bdee5c9e6
|
Merge commit 'bf3a5118069d287c013febd94a977966e4d1f944' into junbo/gitflow_211123_o3de
|
4 years ago |
AMZN-Phil
|
d958502f2c
|
Check return value of qputenv
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
|
4 years ago |
|
AMZN-Phil
|
c2145a6387
|
Use QStringList to avoid false matches against a partial path
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
|
4 years ago |
|
AMZN-Phil
|
def5b3a65d
|
Fix additional left over references to QProcessEnvironment
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
|
4 years ago |
|
AMZN-Phil
|
74e1ee1862
|
Fix non-Windows platforms
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
|
4 years ago |
|
AMZN-Phil
|
e1b6054ff8
|
Fix Project Manager not finding CMake on Windows
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
|
4 years ago |
puvvadar
|
ab58773388
|
Merge commit '092d125acf2eb23099e08f0d93e9b2a3b90ce016' into puvvadar/gitflow_211118_o3de
|
4 years ago |
|
puvvadar
|
e8cdff627c
|
Merge commit '4ad6d3e9f75880558d4003474621b9ada3aef060' into puvvadar/gitflow_211118_o3de
|
4 years ago |
AMZN-Phil
|
092d125acf
|
Merge pull request #5769 from aws-lumberyard-dev/Prism/RemoteGemWarning
Extra gem download failure handling
|
4 years ago |
|
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 |