Commit Graph

202 Commits (0fa00a117c688c40a88dbf6aeb99b27e5d4abf15)

Author SHA1 Message Date
AMZN-daimini e772afa06e
Merge pull request #226 from aws-lumberyard-dev/Prefab/Instantiate/Setup
KEYSTONE USE CASE | Instantiate Prefab
5 years ago
daimini eae9d60c15 Pass position Vector3 as const reference in InstantiatePrefab. 5 years ago
srikappa-amzn 11f811eb7e
Merge pull request #260 from aws-lumberyard-dev/Prefab/CreatePrefab
Added undo and redo support for nested prefab creation
5 years ago
chiyenteng bac334a244
Fix serialization issues related to sequence node/track (#214) (#247)
* Fix serialization issues related to sequence node/track
5 years ago
srikappa a9af90be5a Removed the shouldPropagateTemplateChanges flag to revisit optimization later and fixed some function comments 5 years ago
daimini 8f79379bc8 Fixes as per Ram's review 5 years ago
daimini 76739de282 Fix spacing 5 years ago
daimini ea43eb3ac9 Set position of instantiated prefab 5 years ago
srikappa 3b3b4305c1 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
daimini c9a4b6f50b Better handle the default case for Instantiate 5 years ago
cgalvan 5d3774521f
Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
5 years ago
AMZN-stankowi f44f06c9f0
AssImp set to be the default FBX processor (#78) (#136)
* AssImp set to be the default FBX processor (#78)

If you encounter issues, reach out to the Helios team with details, and then switch back to FBX SDK locally by changing FBXImporter.h

* Merge pull request #219 from aws-lumberyard-dev/sceneapi_scripting

LYN-3030: Fix to export_chunks_builder.py to match the AssImp node paths

* Hide some automated test folders from the asset processor for automatedtesting. This is necessary because these assets should only be processed when running the test, and not any time AP is launched for this project.

* Putting these test assets back to visible to Asset Processor. These tests need to be updated at some point to handle that, but they won't work with this change for now. Note that until this is addressed, these tests may randomly time out if they're the first tests run on a clean asset processor, and these tests launch AP without using a unique port, so the test can also fail if an Asset Processor executable is hanging open.

Grabbed the change I missed from the 1.0 branch merge, no idea how this got lost.

* Moved from main to periodic. Allen and Fuzzy were already on board, and I think with the potential flakiness in this test, we don't want this in main.

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
5 years ago
srikappa 17dbe55189 Added undo and redo support for nested prefab creation 5 years ago
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 5 years ago
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 5 years ago
sharmajs-amzn 957d1360da
Custom UV Stream Names in assimp (#210) (#243)
* Custom UV Stream Names in assimp
https://jira.agscollab.com/browse/LYN-2506
5 years ago
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.
5 years ago
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 5 years ago
Terry Michaels d680995074
Renamed several non-inclusive terms (#236) 5 years ago
greerdv 1fa5728655
Merge pull request #69 from aws-lumberyard-dev/non-uniform-scale-mesh
support for non-uniform scale component with atom mesh component
5 years ago
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.
5 years ago
daimini cf4bbe569b Remove Prefab cache undo node generation for container entities - will move that work to a separate PR. 5 years ago
AMZN-AlexOteiza dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application(#208)
Co-authored-by: aljanru <aljanru@amazon.com>
5 years ago
phistere 93ba2ea251 LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace. 5 years ago
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
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
5 years ago
mnaumov 5f0e7f2cbc merge from main 5 years ago
daimini 67fa4a332b Change CreateLink to return the LinkId 5 years ago
daimini ca8d6f8818 Instantiate Prefab 5 years ago
Luis Sempé 8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
Fixed Lua IDE startup
5 years ago
luissemp 49322b040b Fixed Lua IDE startup 5 years ago
cgalvan 7a6b0c16b7
Merge pull request #206 from aws-lumberyard-dev/cgalvan/RemoveLegacyEditTools
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
cgalvan 143c2516c6
Merge pull request #211 from aws-lumberyard-dev/cgalvan/FixEMFXDocking
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
5 years ago
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 5 years ago
phistere d1067edd3a Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 5f8ffdfdc1 [LYN-3137] Fixed EMFX floating dock widgets not responding to docking events. 5 years ago
Aristo7 9e874ae2ed Merged main in 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
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
5 years ago
phistere 70b4938cff LYN-2524: Launch AP from SDK when not found in the executable directory 5 years ago
amzn-sean 743d6a511a
Merge pull request #192 from aws-lumberyard-dev/physx_character_create
Character controller now uses Add/Remove Simulated Body API
5 years ago
SergeyAMZN 0a09ab7c8e
Merge pull request #173 from aws-lumberyard-dev/MultiplayerPipeline
Merging current state of multiplayer pipeline to main
5 years ago
amzn-sean 7ac246bab5 Character controller now uses Add/Remove Simulated Body 5 years ago
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.
5 years ago
greerdv 62a3b7635b Merge branch 'main' into non-uniform-scale-mesh 5 years ago
mnaumov 5f4275336c Fixing deadlock related to thumbnails
Adding smoothing to thumbnails in AssetBrowser
5 years ago
Nicholas Van Sickle e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
5 years ago
AMZN-daimini 62bc7a66bb
Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
5 years ago
srikappa-amzn f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
5 years ago