birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,534 Commits 3 Branches 3 Tags
c3de8034eb831bcbc8af93052fd8deb280f6294b
Commit Graph

393 Commits

Author SHA1 Message Date
Mike Balfour f23798a10a Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:30 -06:00
Mike Balfour f6faad4adb Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:24 -06:00
Mike Balfour 22df3a843e Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 13:49:19 -06:00
AMZN-Phil 105524b7c0 Add a missing comma to fix generator 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 09:29:40 -08:00
AMZN-Phil 98fa18558e Force Project Manager to use VS2019 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-13 17:40:09 -08:00
nggieber e9db0bca6a Fix typo, add missing header, remove unecessary asserts 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 11:42:18 -08:00
Alex Peterson 6613030fe6 Fix Visual Studio requirements text and doc link (#6312) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-10 10:15:39 -08:00
nggieber 214716dafc Add AZStd string header for linux 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 07:48:41 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
nggieber af9e75da66 Minor PR feedback changes 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 06:19:28 -08:00
nggieber 9f4895aaea Addressed remaining PR feedback 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 15:30:32 -08:00
nggieber 5641bcd5f1 Update Update Project Settings UI to show advanced settings and move project preview to right side panel 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 14:56:50 -08:00
nggieber c632fadb8f Remove Project ID field from New Project settings 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 10:25:04 -08:00
nggieber d7a3d63457 Change ProjectSettings to Singleton interface 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 09:24:01 -08:00
Steve Pham 558532f094 Process launcher updates (#6183) 
* Enable process and ap connection tests on linux
* Updated 'OpenProjectManager' to use new the ProcessLauncher argument type
* Add logic to double-escape escaped double quotes in arguments on windows platforms
* Updated argument for LaunchProjectManager to reflect new ProcessLauncher argument type
* Fixed unit test arguments for 'arg=value' condition
* Fix compile errors for BuilderManager and RHI.Edit\Utils.cpp
* PAL'ify the GetCommandLineParametersAsString() to handle windows specific behavior

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: byrcolin <byrcolin@amazon.com>
 2021-12-08 09:30:19 -08:00
nggieber c7893e0386 Remove unecessary change to CMakeLists.txt 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:54:41 -08:00
nggieber 28e5e8b217 Fix Project Built Tests 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:43:10 -08:00
Alex Peterson 3405cee2ef GUI for engine force registration and renaming (#6184) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-07 10:46:30 -08:00
nggieber 1348b6e825 Removed q file 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:52:52 -08:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:22:03 -08:00
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