Commit Graph

2021 Commits

Author SHA1 Message Date
pereslav 34f4ba7821 Merge from main 2021-04-22 21:40:26 +01:00
amzn-mike 9e2836613f Merge branch 'main' into amzn-mike/lyn-2249-disable-cancel 2021-04-22 15:38:32 -05:00
amzn-mike 58e8233c2c Remove debug message 2021-04-22 15:27:16 -05:00
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 2021-04-22 15:22:44 -05:00
amzn-mike 0428189bed Increase test difficulty 2021-04-22 15:18:54 -05:00
amzn-mike 39789c30d8 Remove container OnAssetCanceled event 2021-04-22 15:03:04 -05:00
amzn-mike 35a47932eb Disable weak references and unit tests for them. 2021-04-22 15:02:41 -05:00
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 2021-04-22 15:00:50 -05:00
sharmajs-amzn 957d1360da Custom UV Stream Names in assimp (#210) (#243)
* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
2021-04-22 12:54:36 -07:00
Eric Phister 38f0203546 Merge pull request #239 from aws-lumberyard-dev/ly-sdk/phistere/LaunchApFromSDK
Launch AssetProcessor from prebuilt SDK
- Look for AssetProcessor in a known SDK layout location if one in executable directory is not found.
- Adds more files to the CMake install to help fix some errors launching AP from SDK.
2021-04-22 14:32:14 -05:00
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 2021-04-22 14:28:42 -05:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
greerdv 1fa5728655 Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
2021-04-22 18:49:36 +01:00
amzn-mike 3907ffc173 Add unit test 2021-04-22 12:01:21 -05:00
mbalfour bd23944531 Fix issues with rapid asset cancellation / reload:
* Asset<T>::QueueLoad didn't trigger any loads in the case where an asset was in a Queued state, it simply returned the reference.  This caused problems in the case where an asset was in the process of being cancelled and garbage collected, as it could be in a queued state with nothing actively loading it.  The method now detects this case and calls GetAsset(), which triggers a new load.
* AssetContainer::IsValid() was returning true for canceled containers that no longer had a root asset.  Now it returns false, to help ensure the container doesn't try to get reused.
* AssetContainer would add entries to the preloadList even if any potential preloads were filtered out from the load.  They are no longer added, since they shouldn't be waiting for any dependent assets to load.  (This could cause incorrect warnings to print in some situations)
* AssetContainer was erroneously warning about removing assets from a missing waiting list.  The warning was removed, as the condition could occur when the same asset was being loading by two different containers - once with dependencies and once without.
* AssetDataStream::RequestCancel has been added, as it was missing, but nothing currently needs to use it.
* AssetManager::GetAssetContainer() now verifies that the container is valid before attempting to reuse it.  This prevents asset containers that are in the middle of cancellation from getting reused.
2021-04-22 12:01:19 -05:00
Benjamin Jillich ba324b8806 [LYN-3013] Github TQO Animation: MorphTarget has data integrity issue (#237)
* Added error reporting for data integrity issues for non-uniform motion data.
* The actual issue was a mismatch between the end times of the morph and the skeletal animations. They need to match in EMotionFX.
* The morph target animation exported a keyframe too much.
2021-04-22 18:53:27 +02:00
hultonha cc4d69f279 Merge branch 'main' into hasareej_LYN-2475_viewportui_switcher 2021-04-22 17:51:28 +01:00
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 2021-04-22 09:47:18 -07:00
AMZN-AlexOteiza dbcb2f9916 Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
2021-04-22 17:46:37 +01:00
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 2021-04-22 11:42:58 -05:00
pereslav 57cbeaff0a Added a cmd argument support for custom cfg files 2021-04-22 17:32:06 +01:00
amzn-sean 0e803713bf Ragdoll now uses Add/Remove SimulatedBody
Addressed Minor Character PR feedback
2021-04-22 17:01:39 +01:00
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 2021-04-22 10:06:40 -05:00
pappeste 62564e68de Fixing hang when parameters are passed 2021-04-22 15:54:08 +01:00
jjjoness 012ab89a23 Changed Play Console to right of toolbar. 2021-04-22 15:45:55 +01:00
hultonha bfc4a3bb21 fix bug for setting SimpleMotion asset 2021-04-22 13:57:03 +01:00
igarri 0ebe6c6079 Setup Table model and Table view 2021-04-22 13:19:39 +01:00
michabr c66e2f4bcf Initial phase of UI Canvas Editor rendering with Atom (#164)
* Move Draw2d.h to Include folder

* Initial phase of UI Canvas Editor rendering with Atom

* Simplify Draw2d by removing BeginDraw2d/EndDraw2d which is no longer needed

* Fix compile errors for non-unity builds
2021-04-21 23:30:11 -07:00
mnaumov 5f0e7f2cbc merge from main 2021-04-21 19:21:02 -07:00
rgba16f f750a491c8 remove mistakenly added .orig file 2021-04-21 20:46:28 -05:00
rgba16f 40a35b4e45 Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-21 20:43:47 -05:00
rgba16f 96bbfb3ff0 Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim 2021-04-21 20:34:38 -05:00
daimini 67fa4a332b Change CreateLink to return the LinkId 2021-04-21 17:43:22 -07:00
daimini ca8d6f8818 Instantiate Prefab 2021-04-21 17:42:33 -07:00
Luis Sempé 8996976efb Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
2021-04-21 17:34:31 -07:00
luissemp 49322b040b Fixed Lua IDE startup 2021-04-21 15:37:15 -07:00
cgalvan 7a6b0c16b7 Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
2021-04-21 16:43:14 -05:00
cgalvan 143c2516c6 Merge pull request #211 from aws-lumberyard-dev/cgalvan/FixEMFXDocking
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
2021-04-21 16:06:26 -05:00
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 2021-04-21 16:04:55 -05:00
phistere d1067edd3a Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 2021-04-21 14:54:53 -05:00
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 2021-04-21 14:54:19 -05:00
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 2021-04-21 14:48:00 -05:00
Aristo7 9e874ae2ed Merged main in 2021-04-21 15:34:29 -04:00
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 2021-04-21 13:57:16 -05:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
phistere 70b4938cff LYN-2524: Launch AP from SDK when not found in the executable directory 2021-04-21 11:55:01 -05:00
amzn-sean 743d6a511a Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
2021-04-21 17:37:35 +01:00
SergeyAMZN 0a09ab7c8e Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
2021-04-21 12:54:28 +01:00
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 2021-04-21 11:13:27 +01:00
amzn-sean b0cb5a381b Merge pull request #104 from aws-lumberyard-dev/fixed_LYN-2998_main
LYN-2998
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
fixed entities not being deselected when entering game mode in editor.
2021-04-21 11:09:32 +01:00