Commit Graph

186 Commits (008c65352476feea64c7cc723ce5656ca3208d64)

Author SHA1 Message Date
pereslav 34f4ba7821 Merge from main 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
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
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
pereslav 57cbeaff0a Added a cmd argument support for custom cfg files 5 years ago
phistere ace7a64b24 Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK 5 years ago
pappeste 62564e68de Fixing hang when parameters are passed 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
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
nvsickle 4f9d7e3782 Simplify ResetInputChannels 5 years ago
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
5 years ago
nvsickle 7e2cbda2d3 Fix viewport display on new level creation 5 years ago
srikappa 78892c8d7e Improved a couple of comments 5 years ago
pereslav 465546a6e4 Merge branch 'main' into MultiplayerPipeline 5 years ago
SJ 3df1ffe3b7
3rd Party static libraries need to be public dependencies to work from installed engine.
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
5 years ago
Mike Balfour 6c65d5f666
Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext
Expose some helpful methods to BehaviorContext
5 years ago
Nicholas Van Sickle 68cc939c6d
Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
5 years ago
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 5 years ago
AMZN-mnaumov f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
5 years ago
mbalfour d9fe89ba56 Addressed feedback - made string& into a string_view. 5 years ago
AMZN-mnaumov 3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
[ATOM-15271] Fixing thumbnail pixelation
5 years ago
Aristo7 c07c57ca2a Revert "Removed HLSL cry compilers and tools"
This reverts commit f8a72e5a04.
5 years ago
Aristo7 8410452067 Revert "Removing hlsl refs in cmake build files"
This reverts commit 7b42402b18.
5 years ago
Aristo7 2a59b7e0e6 Revert "Linux/mac hlsl header refs removed"
This reverts commit 6f33e1404e.
5 years ago
Aristo7 6f33e1404e Linux/mac hlsl header refs removed 5 years ago