Commit Graph

197 Commits

Author SHA1 Message Date
scottr c41283c3ec Merge branch 'main' into ftue_auto_register 2021-06-02 13:22:14 -07:00
Benjamin Jillich 5dff212398 Fixing non-unity build 2021-06-02 19:49:07 +02:00
Benjamin Jillich 1b96fc4361 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514
# Conflicts:
#	Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
2021-06-02 19:35:50 +02:00
AMZN-nggieber 8a28107299 Project Manager Setup Update Project Settings Screen and Flow
* Filled out and connected up UpdateProjectCtrl and UpdateProjectsSettingsScreen
2021-06-02 10:23:58 -07:00
Benjamin Jillich e7e85f91d6 Addressing PR feedback 2021-06-02 19:08:10 +02:00
AMZN-stankowi fc0de9e0e3 Added [[maybe unused]] to fix release build compile issue (#1090) 2021-06-02 09:36:34 -07:00
Esteban Papp 1f65c3ba3a LYN-4134 Automatically add --project-path=<project> to debugging parameters in Editor/AP for engine-centric (#1081) 2021-06-02 09:13:04 -07:00
Benjamin Jillich 39bb0bf2fc [LYN-2514] Create a new project control now reinits the gem catalog and enables gems based on the user selection 2021-06-02 17:53:49 +02:00
Benjamin Jillich b0ef89edf9 [LYN-2514] Update project control now reinits for the selected project and enabled/disables gems based on the user selection in the gem catalog 2021-06-02 17:53:02 +02:00
Benjamin Jillich f106273667 [LYN-2514] Adding functionality to reinit the gem catalog for a given project and enable/disable the changed gems
* Removed test data from gem catalog screen as we can now extract the real data.
* Reiniting the catalog to a project updates the filters, and clears and fills the gem model.
* Added functionality to enable/disable gems based on the user adjustments on the gem catalog.
2021-06-02 17:52:17 +02:00
Benjamin Jillich 53615230c1 [LYN-2514] Adding get engine gem infos to the python bindings 2021-06-02 17:49:40 +02:00
scottr 5554bdf329 [ftue_auto_register] use early return in registered engines loop instead of break 2021-06-02 08:46:57 -07:00
scottr 39d1f27021 [ftue_auto_register] post merge and linux build fixes 2021-06-02 08:39:57 -07:00
scottr 85fcac60a1 Merge branch 'main' into ftue_auto_register 2021-06-02 07:59:05 -07:00
Benjamin Jillich bcdb541b7c [LYN-2514] Sorting gems in the gem catalog after retrieving all gem infos
Added <operator() for sorting the gems after retrieving the list of all gems.
2021-06-02 13:29:10 +02:00
Benjamin Jillich ede8daaece [LYN-2514] Extending pythin bindings to adapt CLI changes for the gem catalog
* Added ExecuteWithLockErrorHandling() which returns an outcome with the actual error we get from python so that we can expose that to the UI.
* Added cmake pybind.
* Get gems now calling get_all_gems and alphabetically sorting the result.
* Added get enabled gems function which first gets the cmake enabled gems file path from the project path and then the list of gem names that are enabled.
* Some changes to the enable and disable gem functions.
2021-06-02 13:27:55 +02:00
Benjamin Jillich 7b6226a8aa [LYN-2514] GemCatalog: Item delegate changes enabled/disabled state in the gem model
When clicking the button on the right side of the gem item delegate, it changes the enabled/disabled state of the gem in the model.
2021-06-02 08:07:16 +02:00
Benjamin Jillich 553318ed17 [LYN-2514] Extending gem model
* Added was previously added state for gems.
* Added helpers to add/remove gems from the model.
* Helpers for extracting the gem model indices to be added/removed.
2021-06-02 08:07:15 +02:00
Alex Peterson a3e73948c5 Improved project creation validation
No longer requires project name to be part of the project path.
2021-06-01 15:32:57 -07:00
Alex Peterson afe20906db Add Project Manager File menu options to Editor 2021-06-01 15:30:14 -07:00
Steve Pham 74ec7a362b Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK
- build.gradle format updates for newer Android Gradle Plugin
- Remove hard coded Android Gradle Plugin version 3.6.4 to be passed in from command args
- Set Android Gradle Plugin min version 4.2.0 in order to support Min CMake version 3.20
- Add ability to use the android sdk to install missing components if needed rather than doing it externally
- Removed argument to pass in the NDK folder to use the android, use the android-sdk instead. Can request specific NDK versions if possible
- Android Gradle Plugin has dependencies by version and is being managed
- More defaults based on tools on path, agp version made possible so they are no longer needed in the command args
2021-05-28 23:24:51 -07:00
greerdv 2c36d6a19a Merge pull request #1039 from aws-lumberyard-dev/transform-float-scale-3
refactor vector scale in Transform to float scale
2021-05-28 21:20:03 +01:00
Esteban Papp ff9a052ce6 Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948
Integration of the LY as an SDK work
2021-05-28 11:30:13 -07:00
greerdv 34abf7376e Merge branch 'main' into transform-float-scale-3 2021-05-28 19:14:45 +01:00
AMZN-stankowi 1369e29c73 Abort calls in AssImp, which occur when an assert is hit in builds th… (#1012)
* Abort calls in AssImp, which occur when an assert is hit in builds that have asserts enabled (like debug) no longer generate a popup. Instead, they are captured as errors and an asset processing failure.

* Added missing include

* Added check for _WRITE_ABORT_MSG, so platforms that don't have it but have signals enabled (Linux profile) compile correctly
2021-05-28 10:44:20 -07:00
pappeste ddab4cf53a Fix for register python bindings 2021-05-28 10:06:21 -07:00
pappeste 9ad70608e8 Fixing compilation failure 2021-05-28 09:46:27 -07:00
pappeste 95b560ba3b Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Code/Tools/ProjectManager/Source/PythonBindings.cpp
2021-05-28 09:37:39 -07:00
AMZN-nggieber 96080d85e4 Project Manager Support Add Existing Projects, Removing, Copying, and Deleting (#961)
* Add Add/RemoveProject to Python Bindings

* Support Project, Add, Remove, Copy, Delete

* Open parent directory when duplicating to discourage path in owning dir

* Remove extra connects for new projects button

* Center project image
2021-05-28 09:32:47 -07:00
pappeste eece07efd3 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 08:29:29 -07:00
Mike Balfour 96905a26d7 Add support for AP-compliant relative paths (#998)
The method "PrefabLoader::GetRelativePathToProject" has been changed to "PrefabLoader::GenerateRelativePath", and reworked to get a correct relative path.  GetFullPath has also been modified to get correct relative paths too.  This requires an Asset Processor connection - if one isn't available (like during unit tests), the methods have fallback logic to produce project-relative paths.

With this change, SliceConverter can't use SaveTemplate() to save the file any more, because GetFullPath now expects to find an existing path, which doesn't work for not-yet-created files.  Instead, it now has to use the same technique as the Editor and call SaveTemplateToString then save the string out as a file.
2021-05-28 09:57:17 -05:00
greerdv c35c1d67e7 update transform widget to work with uniform scale 2021-05-28 11:34:42 +01:00
lumberyard-employee-dm 3c0c066f88 Updating the ProjectManager Gem validation check to make sure the name isn't empty either 2021-05-28 02:54:54 -05:00
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
Benjamin Jillich 5bb55ac1c7 [LYN-2514] Optimizing for new window dimensions (#990) 2021-05-28 07:38:05 +02:00
scottr bd3dae077e Merge branch 'main' into ftue_auto_register 2021-05-27 15:25:47 -07:00
scottr e1dfac34fc [ftue_auto_register] wrapped registration pybind calls with ExecuteWithLock 2021-05-27 15:24:39 -07:00
scottr 3137b961bf [ftue_auto_register] elevated error to assert if registration fails 2021-05-27 14:54:51 -07:00
lumberyard-employee-dm 394ac7ab6a Updated the enable gem and disable gem API (#54)
* Updated the enable gem and disable gem API
Renamed remove_gem_project.py -> disable_gem.py
Renamed add_gem_project.py -> enable_gem.py
Renamed the "add-gem-to-project" command -> "enable-gem"
Renamed the "remove-gem-from-project" command -> "disable-gem"

Fixed the parsing of the enabled gems from the enabled_gems.cmake file

* Adding newline to the end of the CMakeLists.txt
2021-05-27 16:44:50 -05:00
scottr ecc18338fa [ftue_auto_register] move engine registration check into private helper function 2021-05-27 14:19:31 -07:00
scottr 78afc45709 [ftue_auto_register] add logic to auto register engine if it is not already 2021-05-27 12:39:14 -07:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
jjjoness 5942cf066d Merge pull request #983 from aws-lumberyard-dev/LYN-1914
Changed editor icon
2021-05-27 17:41:14 +01:00
AMZN-stankowi 9d94977b2c FbxImportRequestHandler is now loaded only once per AssetBuilder and Editor + re-enabled STL support (#933)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Fixed how FbxImportRequestHandler is loaded

* Bumped version to force FBX to rebuild + removed unused variable

* Revert "Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)""

This reverts commit 978477097892a22e83519646527ff52ba6532f35.

* Revert "Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter""

This reverts commit c1124f26d957388e88cc4990021314b5af247e1d.

* Fixed a bad revert

* Better error reporting at AP launch

* AZ_CRC -> AZ_CRC_CE and removed delayed reload of settings registry file now that it's available at startup

* fixed typo in comment
2021-05-27 08:45:32 -07:00
John Jones-Steele 072f6e194e Changed editor icon 2021-05-27 14:02:01 +01:00
Alex Peterson 13de9de3c1 Project Manager Toolbar Update
- use flow control for projects page for automatic updates when resizing
- made the first time screen only display the first time
2021-05-26 19:47:17 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
cgalvan f1a5160fe7 Merge pull request #963 from aws-lumberyard-dev/cgalvan/FixMacBuildSliceConverter
Fixed extra qualification causing compile error on Mac.
2021-05-26 16:20:02 -05:00
Mike Balfour 6c17c7bfb3 Add new API to convert absolute source paths to relative paths. (#930)
There are already APIs for getting a relative product path from an absolute source path, or getting a relative source path for an *existing* source file, but there were no APIs for getting a relative source path for a *new* source file.  Prefabs will need this ability to be able to correctly generate a relative source path inside the prefab file before the file has been saved.
The logic for relative source paths is a little bit tricky because the paths are relative to the watch folders, and the watch folders can be nested, with different priorities to explain which should take precedence.  The input paths can also include specifiers like "." and "..", which need to be reconciled before creating the final correct relative path.  The included unit tests test all of the tricky edge cases that I was able to identify.
2021-05-26 15:30:21 -05:00