88dcaba8da
Merge pull request #317 from aws-lumberyard-dev/LYN-1099
...
Lyn 1099
2021-04-28 16:16:04 +01:00
60d876a05e
Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize
...
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
2021-04-28 10:07:07 -05:00
b0b7d027a5
Merge pull request #388 from aws-lumberyard-dev/hultonha_LYN-3368_disable_ap_test
...
Disabling Asset Processor test causing intermittent failures
2021-04-28 15:53:47 +01:00
6d624273a9
disabling test causing intermittent failures
2021-04-28 14:43:52 +01:00
1fd6938519
Replaced missing &
2021-04-28 08:56:02 +01:00
409489e938
Merge pull request #365 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-27 18:59:41 -07:00
cac318a30e
Merge pull request #381 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-found-crash-now-reenable-tests
...
SPEC-6522: Re-enable Atom tests in AutomatedTesting.
2021-04-27 18:35:33 -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
e1b55d8f0a
change property call to the new Atom properties for Decal (Atom)
2021-04-27 16:59:53 -07:00
a73d25dfe6
One more broken component causing atom tests to crash + some extra PR feedback
2021-04-27 16:54:01 -07:00
678a831e51
fix expected lines check for Decal (Atom) to go with the update after finding crash bug
2021-04-27 16:40:53 -07:00
019eacc073
fix Decal component name due to crash in SPEC-6561
2021-04-27 16:38:26 -07:00
7aeb9614de
Remove remaining libav references
2021-04-27 16:27:10 -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
963e851119
Merge pull request #372 from aws-lumberyard-dev/LYN-3060-cherry
...
Cherry-pick: LYN-3060 | Launching the Editor with Prefab System enabled results in asserts
2021-04-27 15:37:48 -07:00
7027bcf7ba
Merge pull request #367 from aws-lumberyard-dev/cgalvan/RemoveLegacyPhysicsManager
...
[LYN-3348] Removed legacy CObjectPhysicsManager.
2021-04-27 17:03:56 -05:00
8e88d746a3
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
2021-04-27 16:56:20 -05: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
3ad9435eb9
Merge branch 'main' into cgalvan/RemoveLegacyPhysicsManager
2021-04-27 16:27:22 -05: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
caa982372f
Remove include for removed interface in EditorPrefabComponent.cpp
2021-04-27 14:12:56 -07:00
797ee26f87
Remove EntityOutlinerWidgetInterface, and replace it with PrefabPublicNotificationBus. Introduce events to notify handlers of when instance propagation begins and ends so that widgets can refresh correctly.
2021-04-27 14:12:46 -07:00
51e8b21a0e
Clang compile fix
2021-04-27 14:04:36 -07:00
8a65c6b343
Fix build and runtime issues on iOS
...
Merge pull request #355 from aws-lumberyard-dev/LYN-3280
2021-04-27 13:57:49 -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
59a2550595
Merge pull request #360 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-move-test-to-sandbox
...
SPEC-6522: Moving test back to sandbox while failure is investigated.
2021-04-27 13:27:40 -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
21d99ea07d
[LYN-3348] Removed legacy CObjectPhysicsManager.
2021-04-27 15:16:20 -05: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
dfb33e5d4f
move failing test to sandbox suite while investigation is underway
2021-04-27 11:31:43 -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
jjjoness
cgalvan
Tom Hulton-Harrop
hultonha
kberg-amzn
jromnoa
AMZN-mnaumov
dmcdiarmid-ly
mnaumov
jromnoa
karlberg
Alex Peterson
dmcdiar
carlitosan
Danilo Aimini
Chris Galvan
Vicky
chcurran
daimini
SJ
qingtao
Junbo Liang
Esteban Papp