Commit Graph

430 Commits

Author SHA1 Message Date
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
jonawals f21794b193 Add missing namespace comments 2021-05-28 15:55:13 +01:00
jonawals 5fd23cef35 Merge branch 'TIF/Jenkins' into TIF/Jenkins_Console 2021-05-28 15:52:06 +01:00
jonawals c63de35b68 Address PR feedback 2021-05-28 15:39:28 +01:00
jonawals 728d3b4b98 Address PR comments 2021-05-28 12:33:27 +01:00
jonawals f50f02eb4a Add console entry points 2021-05-28 11:38:02 +01:00
greerdv c35c1d67e7 update transform widget to work with uniform scale 2021-05-28 11:34:42 +01:00
jonawals 684ef8046f Add console command line options 2021-05-28 10:46:25 +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
Yuriy Toporovskyy a71a583048 Bug fix: handle the case where the data source type is `any' in the SCT converter command validation step.
In this case, CreateAny will construct an `any' by `any(T())', with `T = any', which move-constructs from a temporary empty `any'. This causes the check for a empty `any' to fail, and the validation does not even run.

In the case where `T=any', since we cannot construct an `any' which itself holds an `any' (except by super tricky shenanigans), we can simply use the default constructed `any' object (instead of the object stored by the `any') as the object storage for the validation step.
2021-05-27 14:52:50 -04: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
jonawals 990f90410d Address PR comments 2021-05-27 18:21:41 +01:00
jjjoness 5942cf066d Merge pull request #983 from aws-lumberyard-dev/LYN-1914
Changed editor icon
2021-05-27 17:41:14 +01:00
jonawals b13a7e1d3c Remove whitespace 2021-05-27 17:09:59 +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
jonawals e9daed723a Ensure enumeration caches are always updated 2021-05-27 14:19:08 +01:00
jonawals 1936dbc0d1 Fix long line length 2021-05-27 14:11:45 +01:00
jonawals 042a025f61 Private runtime implementation 2021-05-27 14:06:59 +01:00
jonawals e82b54d59b Address PR comments 2021-05-27 14:04:16 +01:00
John Jones-Steele 072f6e194e Changed editor icon 2021-05-27 14:02:01 +01:00
jonawals ec758edd0d Remove iostream include 2021-05-27 13:45:44 +01:00
jonawals 41c8490ebb Add missing cache delete 2021-05-27 13:30:06 +01:00
jonawals 52e61fa3ca Remove JobExceptionPolicy and move knoen error handling 2021-05-27 13:24:48 +01:00
jonawals 8965061b9b Address PR comments 2021-05-27 13:21:11 +01:00
jonawals c3ea2d18ba Remove extra whitespace 2021-05-27 12:15:19 +01:00
jonawals a91e9caaf9 Add missing API comment to DeleteFile 2021-05-27 12:09:28 +01:00
jonawals de38e5ad35 Add missing API comments 2021-05-27 11:46:18 +01:00
jonawals f9425992f8 Runtime refactor 2021-05-27 11:37:34 +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
Alex Peterson da24f4ccde Launch editor from Project Manager 2021-05-26 13:17:16 -07:00
Chris Galvan b68b9000a3 Fixed extra qualification causing compile error on Mac. 2021-05-26 14:55:38 -05:00