d2efdf5c63
Merge pull request #75 from aws-lumberyard-dev/Atom/guthadam/material_dialog_button_and_modality_fixes
...
[ATOM-15173 ATOM-15174] Standardizing dialogs across material editor and component
2021-04-16 13:00:13 -05:00
405276a7ae
Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab
...
Add Json serialization support for ByteStream
Fixes serialization issue with the White Box component when Prefabs are enabled.
2021-04-16 18:28:12 +01:00
0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
...
Lyn 1901
2021-04-16 18:11:15 +01:00
f552fc7ccd
Fix for ReadMesh error reporting
2021-04-16 17:30:06 +01:00
e0b66223e4
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-16 11:25:59 -05:00
ca54931620
Merge pull request #89 from aws-lumberyard-dev/Atom/moudgils/AutomatedTestingNullRHI
...
Enable Null RHI for AutomatedTesting
2021-04-16 08:05:25 -07:00
2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
...
SystemComponent is now only built once in the PhysX.Static target
2021-04-16 14:04:00 +01:00
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-16 12:04:14 +01:00
cbd86cc965
Merge pull request #71 from aws-lumberyard-dev/non-uniform-scale-visibility
...
Bug fixes for non-uniform scale.
Fixing visibility bounds for non-uniformly scaled polygon prism activation.
Fixing editor rigid body position for physx asset colliders with position offsets and NUS.
Fixing runtime subdivision level for asset colliders.
2021-04-16 11:32:50 +01:00
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
2021-04-16 09:57:04 +01:00
ad142c8c12
Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI
2021-04-16 00:38:00 -07:00
41eadd60e4
Merge pull request #83 from aws-lumberyard-dev/Atom/moudgils/BumpResourcePoolBuilder
...
Bump ResourcePoolBuilder as the BufferBindFlags were updated. Also pulled in networking compile fixes to fix profile_nounity from Karl.
2021-04-16 00:35:59 -07:00
51720e269b
Merge branch 'MultiplayerCompileFix' into Atom/moudgils/BumpResourcePoolBuilder
2021-04-15 22:11:39 -07:00
b8ab5be3bb
Merge branch 'main' into Atom/moudgils/AutomatedTestingNullRHI
2021-04-15 21:04:00 -07:00
ca86068d83
Minor update
2021-04-15 20:55:54 -07:00
d0435b4489
Minor update
2021-04-15 20:46:48 -07:00
05359187c4
Test update
2021-04-15 20:45:53 -07:00
89a935cd29
Minor update
2021-04-15 20:44:01 -07:00
ee3f157fb8
Fix memory leak in multiplayer unit test
2021-04-15 20:41:08 -07:00
62b38bdf9e
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 20:24:00 -07:00
82ca4bf221
Merge pull request #80 from aws-lumberyard-dev/AtomTest-Sponza
...
AtomTest Sponza Content
2021-04-15 21:45:02 -05:00
3c631e4a85
Merge branch 'main' into Atom/moudgils/BumpResourcePoolbuilder
2021-04-15 19:16:29 -07:00
4edbf7890b
Bringing fix that has not been migrated to github yet (fixes Windows release builds)
2021-04-15 19:01:15 -07:00
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
2021-04-15 17:56:08 -07:00
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
2021-04-15 16:30:36 -07:00
61c24084e8
Enable Null RHI for AutomatedTesting
2021-04-15 16:13:22 -07:00
8743155b73
Merge pull request #76 from aws-lumberyard-dev/Atom/qingtao/ATOM-13791
...
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
LYN-2908 Pressing Home button crashes the Editor
2021-04-15 15:19:25 -07:00
7f53b931a3
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-15 16:59:09 -05:00
abf26eede1
Bump REsourcePoolBuilder as the bufferBindFlags were updated
2021-04-15 14:00:40 -07:00
ef30f49bf9
Fixed a linux compile issue.
2021-04-15 13:29:29 -07:00
76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
...
Make creation of new prefabs use a relative path to the project
2021-04-15 13:20:18 -07:00
a9516c6498
updated the ref to dccsi env that changed
2021-04-15 15:04:36 -05:00
9516912b9c
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-15 15:03:26 -05:00
020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes ( #73 )
...
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
2021-04-15 14:28:57 -05:00
8a589ff3e1
Merge pull request #68 from aws-lumberyard-dev/Atom/dmcdiar/LYN-2772
...
[LYN-2772] Adding White Box Component to an Entity silently crashes the Editor
2021-04-15 12:26:37 -07:00
48e53ac66b
Correctingtypo
2021-04-15 13:50:29 -05:00
2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
...
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
2021-04-15 11:33:57 -07:00
a9345646f8
fixing a hardcoded path typo that someone submitted on accident.
2021-04-15 13:08:13 -05:00
cc7b4fc251
Updated all materials, did some mesh cleaning adding source file as well.
2021-04-15 13:06:27 -05:00
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
2021-04-15 11:01:15 -07:00
2baa0db2de
Standardizing dialog button boxes across material editor and component
...
Making dialogs modal
https://jira.agscollab.com/browse/ATOM-15173
https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
2021-04-15 18:26:54 +01:00
7ff0c5c33a
fix reserve call that should have been resize - add extra handling to output error
2021-04-15 18:17:02 +01:00
14f7883425
Merge pull request #15 from aws-lumberyard-dev/limit_max_scale
...
setting max value for scale
2021-04-15 17:27:07 +01:00
01dc097fa6
Merge pull request #66 from aws-lumberyard-dev/pruiksma/ATOM-15240
...
ATOM-15240 Fixing thumbnails attempting to use a feature processor that no longer exists.
2021-04-15 11:20:19 -05:00
3f49553b46
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 17:07:25 +01:00
582b098ed2
removing unused local variable
2021-04-15 17:06:56 +01:00
ebebc05cd1
Reenable Blast Automated tests ( #42 )
...
Co-authored-by: Ulugbek Adilbekov <ulugbek@amazon.com >
2021-04-15 16:16:31 +01:00
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
2021-04-15 14:17:11 +01:00
e989a2e697
Merge branch 'limit_max_scale' of https://github.com/aws-lumberyard-dev/o3de into limit_max_scale
2021-04-15 14:00:44 +01:00
Guthrie Adams
Tom Hulton-Harrop
jjjoness
hultonha
guthadam
moudgils
amzn-sean
greerdv
greerdv
moudgils
karlberg
Jonny Galloway
Esteban Papp
kberg-amzn
Vicky
qingtao
srikappa-amzn
Terry Michaels
dmcdiarmid-ly
Nicholas Van Sickle
srikappa
Ken Pruiksma
Ulugbek Adilbekov