b38ab6c2bc
Change reservation strategy in MotionInstancePool to reduce fragmentation
2021-04-20 22:17:11 -07:00
449df7e1ed
Merge pull request #157 from aws-lumberyard-dev/mbalfour/material-property-value
...
Add Image as implicit converter for MaterialPropertyValue
2021-04-20 14:36:43 -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
33b485767f
Address reviewer feedback, make FFont initialization state an atomic state machine
2021-04-20 11:49:59 -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
9ca29b5f33
Merge pull request #162 from aws-lumberyard-dev/Atom/garrieta/ATOM-15285/variantlist_bug
...
[ATOM-15285] ShaderVariantAssetBuilder code merge bug
2021-04-20 12:51:44 -05:00
1a359ac50d
[ATOM-15285] ShaderVariantAssetBuilder code merge bug
...
Fixing what appears to be a code merge/integration bug.
Signed-off-by: garrieta <garrieta@amazon.com >
2021-04-20 10:59:02 -05:00
1256994696
Cleaning up NvCloth gem. Removed any reference to LmbrCentral and legacy renderer since now it uses Atom. ( #154 )
...
- Removed any usage of LmbCentral and legacy renderer from NvCloth gem.
- Cloth rule can only be added to Mesh groups, not allowed in Actor groups anymore.
- Removed ActorAssetHelper since actors now share the mesh model format and therefore they also use MeshAssetHelper.
- Updated NvCloth gem.json file with the fields from the template.
- Updated cloth chicken asset to not convert axis.
2021-04-20 15:38:26 +01:00
5aa4642c12
Added another implicit converter to MaterialPropertyValue so that generated images can be used with material properties more easily.
...
(cherry picked from commit 66d7e9672ca0d6ced068dd95d8b52f88b5492c1f)
2021-04-20 09:29:43 -05:00
f5a28d3a41
Merge pull request #128 from aws-lumberyard-dev/NvCloth_Atom_ActorAsset
...
Cloth data is exported/imported from the Atom Mesh that the Actor references
2021-04-20 09:12:01 +01:00
86e5df908a
Merge pull request #139 from aws-lumberyard-dev/Atom/qingtao/ATOM-15272
...
ATOM-15272 Running game with Actor spams asserts in the log resulting in low framerate
2021-04-19 21:59:33 -07:00
dee0f84704
Clarified lazy initialization and added some thread sanity logic after discussion with @rgba16f
2021-04-19 17:00:36 -07:00
d1ba2155c5
PR feedback
2021-04-19 15:55:58 -07:00
2cd2550771
Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
...
ATOM-5921 Material Editor: Select newly created materials in the asset browser
2021-04-19 17:53:15 -05:00
34be0cd4b5
Fixing string search
2021-04-19 15:31:45 -07:00
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
ddb08789d2
SPEC-6395 GameLauncher monolithic build failure in CreateModuleClass_Gem_Blas ( #137 )
2021-04-19 15:14:48 -07:00
dd7334471f
Fix comment punctuation
2021-04-19 15:13:08 -07:00
d2fadcb0e3
Fix context menu handling in multi-viewport scenarios (the logic bugs here were many and nuanced, but we're narrowing in on something robust).
...
Specifically this:
-Ensures key/mouse up event propagation works across multiple viewports
-Ensures that mouse up events for manipulators only get delivered if there's a corresponding mouse down event
-Also tidies up the "are we done processing events this tick?" logic in ViewportManipulatorController
2021-04-19 15:13:06 -07:00
8fc69113c9
Get the default viewport context on demand in FFont, as it may change
2021-04-19 15:08:06 -07:00
95f701b74d
Merge pull request #90 from aws-lumberyard-dev/scripting/function_node_fixes
...
Scripting Canvas function variable scoping rules
2021-04-19 13:39:28 -07:00
3b4e424d38
Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
...
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
c9153b0353
ATOM-15272 Running game with Actor spams asserts in the log resulting in low framerate
...
The condition was setup wrongly when introducing DynamicInputAssembly.
2021-04-19 11:47:57 -07:00
dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
...
[ATOM-15269] disabling source control thumbnails in material editor
2021-04-19 10:57:03 -07:00
a7f5462f3d
Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression
...
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
2021-04-19 12:07:32 -05:00
568b31cf1c
[LYN-2856] EMotionFX: Creating an Anim Graph snapshot crashes the Editor ( #67 )
...
Cherry picking bug fix from 1.0
2021-04-19 18:03:28 +02:00
4c2260af97
Lyn 2651 rebased to main ( #74 )
...
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
2021-04-19 08:51:52 -07:00
febad58c64
LYN-652 to unblock Linux Automated Testing
2021-04-19 10:26:41 -05:00
ce6d9e51ee
Merge branch 'main' into sceneapi_script_regression
2021-04-19 09:32:29 -05:00
4e19d6a83a
Merge branch 'main' into NvCloth_Atom_ActorAsset
2021-04-19 11:23:57 +01:00
46b9f1934d
Removed commented line
2021-04-18 23:15:02 -07:00
456bcb3bf9
Updated the EnvironmentCubeMapPipeline to match recent changes to the MainPipeline.
...
Set the multisample state on the EnvironmentCubeMapPipeline render settings.
2021-04-18 14:57:52 -07:00
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
b3cc14dd5c
disabling source control thumbnails in material editor
2021-04-16 18:59:21 -07:00
f5044ae08e
Merge pull request #81 from aws-lumberyard-dev/LYN-2893
2021-04-16 17:56:31 -07:00
3d337add5c
SPEC-6397 Mismatched type in ImGuiGpuProfiler during OSX asset builds
...
Fixed Mac compile issue.
2021-04-16 17:43:36 -07:00
41db22be3d
[CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence ( #103 )
...
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85 )
2021-04-16 17:06:58 -07:00
b38449ffaa
Merge branch 'main' into LYN-2893
2021-04-16 16:21:36 -07:00
40bca24204
Merge pull request #116 from aws-lumberyard-dev/Atom/mnaumov/LYN-3004
...
[LYN-3004] Moving thumbnail assets to AtomLyIntegration so thumbnails work in Editor
2021-04-16 16:09:44 -07:00
9195abe5c6
Merge pull request #102 from aws-lumberyard-dev/Atom/qingtao/ATOM-15252
...
ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
2021-04-16 15:50:37 -07:00
c05b83915c
Merge pull request #115 from aws-lumberyard-dev/Atom/guthadam/ATOM-15267
...
[ATOM-15267] Material Editor: Create material dialog respects default standard PBR selection
2021-04-16 17:30:37 -05:00
6924621cc1
Merge pull request #112 from aws-lumberyard-dev/github/staging
...
Integrating github/staging through commit ef88e6e
2021-04-16 15:21:17 -07:00
b8b90c42e2
Merge pull request #52 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15236
...
[ATOM-15236] Fixing camera panning and zooming
2021-04-16 15:10:47 -07:00
01a2ea6423
Moving thumbnail assets to AtomLyIntegration
2021-04-16 14:21:20 -07:00
0db617f4d8
Make EMotionFX shaders load from the Shaders directory, instead of prepending "Shaders" to all filenames ( #56 )
...
Because the `shaderPath` variable is used as a base directory, it needs
to end with the directory separator. Otherwise the parts before the data
dir become a file prefix used when loading all shaders. Attempts to load
"Line_VS.glsl" from "Shaders/" end up instead trying to load
"ShadersLine_VS.glsl".
2021-04-16 14:19:45 -07:00
c98a1cebaa
GetDefaultView needs full View definition
2021-04-16 13:33:16 -07:00
5ef212624f
Merge pull request #53 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5659
...
[ATOM-5659] Adding "Open Material Editor" action to Material Component slot context
2021-04-16 12:54:31 -07:00
854167c68e
Ensure default material selection works when dialog is opened
...
https://jira.agscollab.com/browse/ATOM-15267
2021-04-16 14:53:31 -05:00
085aa78ec9
Merge branch 'main' into sceneapi_script_regression
2021-04-16 14:29:47 -05:00
Walters
Mike Balfour
Nicholas Van Sickle
AMZN-mnaumov
galibzon
garrieta
Aaron Ruiz Mora
mbalfour
Vicky
mnaumov
Guthrie Adams
Esteban Papp
Luis Sempé
qingtao
jackalbe
Benjamin Jillich
AMZN-stankowi
dmcdiar
guthadam
SJ
chiyenteng
Alex Peterson
Chris Burel
alexpete