Commit Graph

2670 Commits

Author SHA1 Message Date
pappeste d1a2eed40c Fix identiation issues 2021-05-27 17:26:25 -07:00
pappeste 62b6cfac42 letting users pass CMAKE_MODULE_PATH to find the engine 2021-05-27 16:58:06 -07:00
lumberyard-employee-dm fee4bbdd5f Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 18:41:42 -05:00
lumberyard-employee-dm da147f273d Adding VERBOSE messages to the SettingsRegistry.cmake 'ly_get_gem_load_dependencies()' function which logs the gem target to it's load dependencies 2021-05-27 18:41:28 -05:00
pappeste 0e0e7591c5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 16:09:52 -07:00
pappeste 166db0b0c6 Android fix for FastNoise 2021-05-27 16:09:12 -07:00
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 2021-05-27 17:35:08 -05:00
lumberyard-employee-dm 8ed351018f Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 17:12:51 -05:00
lumberyard-employee-dm 1c52147c3a Fixed path case issue in the declaration of the path to the UiBasics gem 2021-05-27 17:12:28 -05:00
pappeste 0d80d5ead3 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 15:04:40 -07:00
pappeste d6cfa68333 Reverting error check and comment 2021-05-27 15:04:17 -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
pappeste f9b2517ea3 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 14:43:22 -07:00
pappeste 1fa7adb185 Adding missing gem.json files 2021-05-27 14:42:50 -07:00
lumberyard-employee-dm f6568f5c63 Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 2021-05-27 13:10:54 -07:00
lumberyard-employee-dm f3a2777ab1 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 15:08:34 -05:00
lumberyard-employee-dm 18e479589d Updating the Install_common.cmake ly_setup_o3de_install() function to be
able forward all the ly_add_targets calls within a single source Engine
CMakeLists.txt to a single installed Engine CMakeLists.txt
2021-05-27 12:19:49 -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
lumberyard-employee-dm 4e80ce1b1d Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 2021-05-27 12:36:33 -05:00
pappeste cba5c35de5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 10:30:28 -07:00
pappeste 0dd8fce2b0 Pass on fixing LmbrCentral.Static dependencies 2021-05-27 10:30:11 -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
greerdv e1e1217c6a Merge pull request #984 from aws-lumberyard-dev/attachments-transform-scale
update usages of transform vector scale
2021-05-27 18:24:16 +01:00
greerdv 03d54014f7 Merge pull request #985 from aws-lumberyard-dev/physics-transform-scale
update physics code to avoid vector scale Transform functions
2021-05-27 18:03:23 +01:00
Tom Hulton-Harrop b4ab2032e8 Fix for viewport ui crash and small refactor (#992) 2021-05-27 18:03:01 +01:00
greerdv 066de9d365 Merge pull request #987 from aws-lumberyard-dev/manipulator-transform-scale
update manipulators to avoid using vector scale Transform functions
2021-05-27 17:55:37 +01:00
Steve Pham 600f97a46c Updating DirectXShaderCompiler 3P Packages to use built-from-source version (#976) 2021-05-27 09:41:45 -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
Alex Peterson 7cd325bad9 Adding ProjectManager as an Editor runtime dependency
The project manager is needed by the editor if it does not know what project to use
2021-05-27 09:40:48 -07:00
Terry Michaels fd8fe8b939 Fixed newly created level having the right source field set (#986)
* Fixed an issue with the source field a newly created level not being set correctly
2021-05-27 11:40:16 -05:00
Jonny Galloway 528934a437 Merge pull request #957 from aws-lumberyard-dev/gallowj/main/DCCsi
Gallowj/main/dccsi
2021-05-27 11:39:55 -05:00
AMZN-puvvadar 51eb68f462 Merge pull request #886 from aws-lumberyard-dev/mp_serialize_vector
Add Multiplayer Rewindable fixed vector and array types and integrate with MP jinja templates
2021-05-27 09:31:59 -07:00
AMZN-stankowi 56942d0f68 Fixed periodic failing test. Updated for new combined meshes, plus added some additional debug printing on failures. (#954) 2021-05-27 09:27:54 -07: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
greerdv f4c017e813 Merge pull request #968 from aws-lumberyard-dev/animation-transform-scale
update usages of vector scale on Transform to use uniform scale
2021-05-27 16:44:26 +01:00
amzn-sean 529e29071c update Ragdoll component to only uses Handles (#981) 2021-05-27 16:42:17 +01:00
John Jones-Steele bdbeaa8e54 Merge branch 'main' into LYN-1914 2021-05-27 16:09:23 +01:00
greerdv f286057046 update manipulators to avoid using vector scale Transform functions 2021-05-27 16:05:18 +01:00
gallowj d53367858b Altered a variable to make usage more clear. 2021-05-27 09:50:49 -05:00
gallowj b072d286d2 Merge remote-tracking branch 'upstream/main' into gallowj/main/DCCsi 2021-05-27 09:43:18 -05:00
gallowj 379f0717fa transitioned from use of bootstrap.cfg to .o3de\Reigistry\bootstrap.setreg 2021-05-27 09:39:05 -05:00
greerdv ece62c51d8 update physics debug draw to avoid vector scale Transform functions 2021-05-27 15:28:28 +01:00
Mike Balfour 7ced53cf58 [SPEC-7039] Fix for mac build (#969)
Fix for the following error:
/workspace/o3de/Code/Tools/SerializeContextTools/SliceConverter.h:55:41: error: extra qualification on member 'ConvertSliceInstance'
2021-05-27 09:00:32 -05:00
greerdv 6b7caa93b1 update collider component to avoid vector scale Transform functions 2021-05-27 14:47:06 +01:00
greerdv dd94795106 update force region to avoid vector scale Transform functions 2021-05-27 14:43:58 +01:00
greerdv a0adff8815 Merge branch 'main' into animation-transform-scale 2021-05-27 14:30:25 +01:00
greerdv e0ed535771 remove unused render cube function 2021-05-27 14:29:54 +01:00
John Jones-Steele 072f6e194e Changed editor icon 2021-05-27 14:02:01 +01:00
greerdv c4dafc8495 update usages of transform vector scale 2021-05-27 12:54:13 +01:00
greerdv 7353f262c5 Merge pull request #980 from aws-lumberyard-dev/remove-deprecated-transform-api
update rigid body to use non-deprecated function and remove many depr…
2021-05-27 12:44:17 +01:00