1c151e6a75
Merge branch 'main' into LYN-1932
2021-04-19 11:10:51 +01:00
7e85cdd045
Part 1 of changing colors to O3DE.
2021-04-19 10:58:26 +01:00
c5657373b5
Merge pull request #127 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15245
...
[ATOM-15245] Baking a Reflection Probe crashes the Editor
2021-04-18 23:52:01 -07: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
cc6393b074
Merge pull request #119 from aws-lumberyard-dev/jckand/LYN-2764
...
LYN-2764: Replacing image asset for ImageGradient automated test
2021-04-17 12:06:59 -05:00
407885dd1b
Merge pull request #77 from aws-lumberyard-dev/platform/SPEC-6061
...
SPEC-6061 Fixes for android nightly unit tests
2021-04-17 09:21:05 -07:00
287a163af2
Merge branch 'main' into platform/SPEC-6061
2021-04-16 21:32:08 -07:00
7e81d407ca
Merge pull request #93 from aws-lumberyard-dev/LYN-2726-ProjectRoot
...
LYN-2726 Updated the Settings Registry Merge Utils logic to determine the project root in precedence of bootstrap.cfg -> *.setreg -> scan upwards for project.json location -> command line --project-path parameter
2021-04-16 22:51:21 -05:00
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05:00
944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
...
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
2021-04-16 18:40:38 -07:00
1e80012df1
Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap
...
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
2021-04-16 20:30:40 -05:00
37b4b69bb9
Adding the */Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.* path to the pal allowed list to allow mention of the IOS macro in the PlatformDefaults.h/PlatformDefaults.cpp file
2021-04-16 20:07:20 -05:00
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
603ee5bf83
Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry
2021-04-16 18:55:08 -05:00
96ef349931
Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file
...
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
2021-04-16 18:55:06 -05:00
bf2732a26d
Moved the PlatformDefaults files from AzFramework to AzCore
2021-04-16 18:55:05 -05:00
6b1e2c52b1
Adding newline at end of file of bootstrap.cfg
2021-04-16 18:54:59 -05:00
373f60f29c
Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root
2021-04-16 18:54:58 -05:00
ab11b234a8
Removed AssetProcessor Settings from the bootstrap.cfg file as they are
...
being shadowed by the <engine-root>/Engine/Registry/bootstrap.setreg
file.
Attempting to set those values in the bootstrap.cfg would only result in
them being overridden when the bootstrap.setreg is merged into the
settings registry
2021-04-16 18:54:56 -05:00
a519bd6d0c
Fix EditorViewportWidget stealing keyboard focus
...
grabKeyboard was used by CRenderViewport to ensure it received some events, but that logic is no longer needed and the corresponding release was removed. This just removes grabKeyboard entirely - eventually all input event logic will be removed as well.
2021-04-16 16:48:22 -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
7216b40342
Merge branch 'main' into jckand/LYN-2764
2021-04-16 17:12:22 -05: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
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
2021-04-16 15:23:26 -05: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
3e9c086872
LYN-2764: Replacing image asset for ImageGradient automated test
2021-04-16 14:40:44 -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
jjjoness
dmcdiarmid-ly
dmcdiar
jckand-amzn
Steve Pham
spham
lumberyard-employee-dm
Nicholas Van Sickle
SJ
Vicky
chiyenteng
mcgarrah
Esteban Papp
AMZN-mnaumov
Guthrie Adams
Alex Peterson
jckand
mnaumov
Chris Burel
alexpete
guthadam
hershey5045
qingtao
greerdv