34f4ba7821
Merge from main
2021-04-22 21:40:26 +01:00
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
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
d680995074
Renamed several non-inclusive terms ( #236 )
2021-04-22 13:31:26 -05:00
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
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
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
93ba2ea251
LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace.
2021-04-22 11:42:58 -05:00
57cbeaff0a
Added a cmd argument support for custom cfg files
2021-04-22 17:32:06 +01:00
ace7a64b24
Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK
2021-04-22 10:06:40 -05:00
62564e68de
Fixing hang when parameters are passed
2021-04-22 15:54:08 +01:00
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
5f0e7f2cbc
merge from main
2021-04-21 19:21:02 -07:00
8996976efb
Merge pull request #222 from aws-lumberyard-dev/scripting/bug_fixes
...
Fixed Lua IDE startup
2021-04-21 17:34:31 -07:00
49322b040b
Fixed Lua IDE startup
2021-04-21 15:37:15 -07:00
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
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
ee90a73744
[LYN-3105] Fixed missing include.
2021-04-21 16:04:55 -05:00
d1067edd3a
Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK
2021-04-21 14:54:53 -05:00
5061f39406
Merge branch 'main' into cgalvan/RemoveLegacyEditTools
2021-04-21 14:54:19 -05:00
5f8ffdfdc1
[LYN-3137] Fixed EMFX floating dock widgets not responding to docking events.
2021-04-21 14:48:00 -05:00
9e874ae2ed
Merged main in
2021-04-21 15:34:29 -04:00
0efa1e7817
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
2021-04-21 13:57:16 -05:00
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
70b4938cff
LYN-2524: Launch AP from SDK when not found in the executable directory
2021-04-21 11:55:01 -05:00
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
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
7ac246bab5
Character controller now uses Add/Remove Simulated Body
2021-04-21 11:13:27 +01:00
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
62a3b7635b
Merge branch 'main' into non-uniform-scale-mesh
2021-04-21 10:56:36 +01:00
5f4275336c
Fixing deadlock related to thumbnails
...
Adding smoothing to thumbnails in AssetBrowser
2021-04-20 20:05:32 -07:00
e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
...
Cherry-pick viewport fixes to main
2021-04-20 19:45:01 -07:00
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
2021-04-20 16:22:34 -07:00
f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
2021-04-20 15:42:05 -07:00
4f9d7e3782
Simplify ResetInputChannels
2021-04-20 15:27:38 -07:00
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
2021-04-20 15:27:34 -07:00
7e2cbda2d3
Fix viewport display on new level creation
2021-04-20 15:27:32 -07:00
78892c8d7e
Improved a couple of comments
2021-04-20 14:30:56 -07:00
465546a6e4
Merge branch 'main' into MultiplayerPipeline
2021-04-20 22:11:52 +01:00
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
2021-04-20 14:11:08 -07:00
6c65d5f666
Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext
...
Expose some helpful methods to BehaviorContext
2021-04-20 15:58:08 -05:00
68cc939c6d
Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
...
Fix debug font rendering & assert on game mode transition
2021-04-20 12:32:26 -07:00
f53c1e8084
3rd Party static libraries need to be public dependencies to work from installed engine.
2021-04-20 12:16:40 -07:00
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…
2021-04-20 11:38:34 -07:00
d9fe89ba56
Addressed feedback - made string& into a string_view.
2021-04-20 13:37:10 -05:00
3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
...
[ATOM-15271] Fixing thumbnail pixelation
2021-04-20 11:37:02 -07:00
c07c57ca2a
Revert "Removed HLSL cry compilers and tools"
...
This reverts commit f8a72e5a04
2021-04-20 12:53:46 -05:00
8410452067
Revert "Removing hlsl refs in cmake build files"
...
This reverts commit 7b42402b18
2021-04-20 12:53:03 -05:00
2a59b7e0e6
Revert "Linux/mac hlsl header refs removed"
...
This reverts commit 6f33e1404e
2021-04-20 12:52:40 -05:00
6f33e1404e
Linux/mac hlsl header refs removed
2021-04-20 12:27:05 -05:00
pereslav
sharmajs-amzn
Eric Phister
Terry Michaels
greerdv
Benjamin Jillich
AMZN-AlexOteiza
phistere
pappeste
michabr
mnaumov
Luis Sempé
luissemp
cgalvan
Chris Galvan
Aristo7
Esteban Papp
amzn-sean
SergeyAMZN
greerdv
Nicholas Van Sickle
AMZN-daimini
srikappa-amzn
srikappa
SJ
Mike Balfour
AMZN-mnaumov
mbalfour