aaf2200122
Merge branch 'main' into platform/SPEC-6061
2021-04-16 17:58:49 -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
250f8d8db0
SPEC-6246 Prevent job overrides from PR branches ( #110 )
2021-04-16 16:36:21 -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
a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile
2021-04-16 16:06:54 -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
73f275f479
Get FindOpenGLInterface to use ly_add_external_target() instead
2021-04-16 15:37:26 -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
41981412c5
SPEC-6370 Mark a build as "NOT_BUILT" if it didnt build anything
2021-04-16 13:56:46 -07:00
c98a1cebaa
GetDefaultView needs full View definition
2021-04-16 13:33:16 -07:00
10e8cb9042
Merge branch 'main' into platform/SPEC-6061
2021-04-16 13:09: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
c5c7332642
Merge pull request #92 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14101
...
[ATOM-14101] Adding "copy name" and "copy path" to Material Editor
2021-04-16 12:23:03 -07:00
8378f52ba6
Fix bug in ShaderVariantAssetBuilder. Add cvar in MeshDrawPacket class. ( #61 )
...
Fix bug in ShaderVariantAssetBuilder. Add a console variable to force root shader variant usage.
2021-04-16 12:06:05 -07:00
10faddb113
Integrating github/staging through commit ef88e6e
2021-04-16 12:05:11 -07:00
0aae99c491
Merge branch 'main' into Atom/qingtao/ATOM-15252 to first the blast test issue in AR.
2021-04-16 11:23:30 -07:00
9c4d8513f1
Merge pull request #101 from aws-lumberyard-dev/non-uniform-scale-event-handlers
...
fixing bugs with failing to disconnect from non-uniform scale event h…
2021-04-16 19:13:42 +01:00
bc9b2b4c2e
Fixed Mac compile issue.
...
Set default refresh type to realtime (due to a known issue with OncePerSecond with ASV)
2021-04-16 11:05:03 -07:00
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
8e34d784e6
ATOM-15252 [Atom 0.8.5] Track View capture crashes when scene contains certain postfx
...
The crash was because the "BlendColorGradingLutImageAttachmentId" attachment got imported to attachment database twice.
This fix avoids import this attachment twice. It also avoid crash but only report a warning if an imported attachment wasn't used in any scope.
Enable both RHI and RPI validation (no visiable performance impact observed.
2021-04-16 09:47:03 -07: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
2f115cb739
Merge branch 'main' into LYN-2893
2021-04-16 09:10:40 -07:00
1363a5b76c
fixing bugs with failing to disconnect from non-uniform scale event handlers in multiple places
2021-04-16 16:52:30 +01:00
d9bb0683ec
Merge branch 'main' into platform/SPEC-6061
2021-04-16 08:12:29 -07: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
spham
SJ
Vicky
chiyenteng
Esteban Papp
AMZN-mnaumov
Guthrie Adams
Alex Peterson
mnaumov
Chris Burel
alexpete
guthadam
hershey5045
qingtao
greerdv
Tom Hulton-Harrop
jjjoness
hultonha
greerdv
moudgils
amzn-sean
moudgils
karlberg