409489e938
Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-27 18:59:41 -07:00
a4047baccb
Merge pull request #265 from aws-lumberyard-dev/Atom/mnaumov/ATOM-13851
...
[ATOM-13851] Adding custom title to PropertyAssetCtrl
2021-04-27 17:42:23 -07:00
17d5febda5
Merge pull request #337 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15355
...
[ATOM-15355] Raytracing mesh transforms are incorrect after initial load
2021-04-27 17:39:51 -07:00
793d60f150
Merge main
2021-04-27 17:07:42 -07:00
a73d25dfe6
One more broken component causing atom tests to crash + some extra PR feedback
2021-04-27 16:54:01 -07:00
618d80e738
Deleting touchpoints with the legacy cry renderer in an attempt to fix a failing test
2021-04-27 16:26:26 -07:00
2fc710d73b
Addressing PR feedback
2021-04-27 16:03:39 -07:00
ff438688dc
Merge branch 'main' into Atom/dmcdiar/ATOM-15355
2021-04-27 16:02:49 -07:00
78508ec211
Merge pull request #362 from aws-lumberyard-dev/carlitosan-parser-fixes
...
Carlitosan parser fixes Fixes for branching runtime, nested user branch parse-error, unit tests for both. LYN-3338
2021-04-27 15:52:44 -07:00
daea5e93b2
Adding groupname to material instance
2021-04-27 14:35:03 -07:00
e4509dbe68
Merge pull request #322 from aws-lumberyard-dev/Atom/qingtao/ATOM-6088
...
ATOM-6088 Unified approach to send draws to a single viewport
Created a template class TagRegistery which implements the previous DrawListTagRegistry. The template is used for both DrawListTagRegistry and DrawFilterTagRegistry
Added DrawFilterTag to DrawItemKeyPair
Added DrawFilterMask support in DrawPacket and DrawPacketBuilder
Added CreateDynamicContext for render pipeline which allows draw to selected render pipeline.
Updated RasterPass's BuildCommandListInternal function to filter draw items for its owner RenderPipeline.
2021-04-27 14:34:27 -07:00
b1fac0a89e
Merge branch 'main' into carlitosan-parser-fixes
2021-04-27 14:25:08 -07:00
812f624020
add missing numeric caster for platform safe Lua integer use
2021-04-27 14:22:29 -07:00
138b10c902
Unity build fixes
2021-04-27 14:19:41 -07:00
51e8b21a0e
Clang compile fix
2021-04-27 14:04:36 -07:00
16c31cde3e
Fix issue found in PR
2021-04-27 13:53:18 -07:00
0c90990462
Merge branch 'main' into LYN-3280
2021-04-27 13:29:04 -07:00
60db6b55d0
Address feedback of PR for ATOM-6088.
...
* Rename DrawItemKeyPair to DrawItemProperties.
* Switch back to use Ptr<DrawListTagRegistry> instead of DrawListTagRegistry
* Updated some comment.
2021-04-27 13:26:43 -07:00
be4a4b44f3
Missed one more merge issue
2021-04-27 13:24:15 -07:00
b6a710a7fa
Fixing more merge issues
2021-04-27 13:21:59 -07:00
ff635064bd
Forgot to stage this fix to a bad merge
2021-04-27 13:06:11 -07:00
901428668c
Merging latest origin
2021-04-27 13:03:31 -07:00
83f3cbd4a1
Merge pull request #151 from aws-lumberyard-dev/SPEC-6072
...
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
2021-04-27 12:13:21 -07:00
5544621bcc
Merge branch 'main' into carlitosan-parser-fixes
2021-04-27 12:10:53 -07:00
66dd89aacd
Fixes for branching runtime, nested user branch parse-error, unit tests for both. LYN-3338
2021-04-27 12:08:49 -07:00
1a66d8db31
Using official ImGui fix for unused variable warning
2021-04-27 11:42:05 -07:00
71c315b2b7
SPEC-6510 Illegal instruction in asset_mac.sh on clean asset builds ( #349 )
2021-04-27 11:38:10 -07:00
8cb1edb7d7
Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics
2021-04-27 11:37:56 -07:00
03e681ca5f
Merge from main
2021-04-27 11:26:02 -07:00
5c75415714
Merge branch 'main' into LYN-3280
2021-04-27 11:07:51 -07:00
5f33337fec
Merge main
2021-04-27 11:05:22 -07:00
a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
...
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
6aa5b5698f
Removed Cry FogVolume component ( #346 )
2021-04-27 12:17:50 -05:00
28d7b1f76b
Merge pull request #330 from aws-lumberyard-dev/LYN2903_ScriptCanvasDeleteComponentVariableCrash
...
Null check when removing old component variables.
2021-04-27 10:12:10 -07:00
eb0758f63a
[SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows
2021-04-27 09:48:50 -07:00
17997b3df8
[LYN-3135] Animation Editor: Some of the default animation assets are broken ( #348 )
...
* Cowboy asset was missing mesh group.
* There was a coordinate system rule mismatch between the animations and the character that led to skinning artefacts.
2021-04-27 18:40:04 +02:00
fc3a48bb26
EMFX: Fix a crash when deleting blend tree node ( #331 )
2021-04-27 09:07:34 -07:00
6987dac6f3
Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create
...
Ragdoll now uses Add/Remove SimulatedBody
2021-04-27 15:53:23 +01:00
d20fb50c9d
Cloth CPU Skinning using MCore DualQuaternions instead of Cry DualQuat
2021-04-27 14:52:33 +01:00
5e50fc2961
fix build failure
2021-04-27 14:43:54 +01:00
95a44c481a
fixed errors from main merge
2021-04-27 14:17:05 +01:00
fbb8727407
Merge branch 'main' into physx_ragdoll_create
2021-04-27 11:04:04 +01:00
73f3ec66b5
Set non-uniform scale in SetMesh.
2021-04-27 02:05:06 -07:00
c415fcc0b4
Cloth will override all the vertices of the mesh and do CPU skinning on the non-simulated vertices when the optimization 'remove static particles' is enabled
2021-04-27 10:00:27 +01:00
cfc09ccfb7
Merge pull request #305 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15244
...
[ATOM-15244] Crash: Reflection Probe, Untoggle 'Use Baked Cubemap' when probe entity is deactivated
2021-04-26 21:56:42 -07:00
ab60db65cb
Merge pull request #147 from aws-lumberyard-dev/genewalt_emfx_ReleaseUnusedRawAssetDataAfterInit
...
Release unused raw asset data in EMotionFX asset
2021-04-26 19:27:28 -07:00
fdcb19f45a
Reverting some unused code
2021-04-26 17:48:49 -07:00
91f027a05c
PR feedback
2021-04-26 17:42:49 -07:00
3998a8b622
Merge branch 'main' into Atom/dmcdiar/ATOM-15244
2021-04-26 17:35:19 -07:00
7da10ac924
Null check when removing old component variables. This is used for graph properties that have been deleted.
2021-04-26 16:17:14 -07:00
kberg-amzn
AMZN-mnaumov
dmcdiarmid-ly
mnaumov
karlberg
dmcdiar
carlitosan
Vicky
chcurran
amzn-sj
qingtao
Junbo Liang
Esteban Papp
Terry Michaels
Gene Walters
junbo
Benjamin Jillich
rhongAMZ
amzn-sean
Aaron Ruiz Mora
Gene Walters