9cc0d3fa2d
Minor cleanup
2021-04-20 01:01:27 -07:00
bfe36a388d
Merge branch 'main' into Atom/dmcdiar/ATOM-14706
2021-04-19 20:27:28 -07:00
2cd2550771
Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
...
ATOM-5921 Material Editor: Select newly created materials in the asset browser
2021-04-19 17:53:15 -05:00
ddb08789d2
SPEC-6395 GameLauncher monolithic build failure in CreateModuleClass_Gem_Blas ( #137 )
2021-04-19 15:14:48 -07:00
146633050b
Merge pull request #55 from aws-lumberyard-dev/cgalvan/EntityHelperRefactor
...
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
2021-04-19 15:57:23 -05:00
95f701b74d
Merge pull request #90 from aws-lumberyard-dev/scripting/function_node_fixes
...
Scripting Canvas function variable scoping rules
2021-04-19 13:39:28 -07:00
3b4e424d38
Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
...
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
2021-04-19 13:18:27 -05:00
dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
...
[ATOM-15269] disabling source control thumbnails in material editor
2021-04-19 10:57:03 -07:00
06d6ab9715
[LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback.
2021-04-19 12:29:58 -05:00
a7f5462f3d
Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression
...
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
2021-04-19 12:07:32 -05:00
d6788996fc
Merge pull request #130 from aws-lumberyard-dev/LYN-3055
...
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
2021-04-19 11:52:16 -05:00
5c3e5aa7db
removing all to_lower()
2021-04-19 11:26:15 -05:00
387dd1e43a
normalizing Linux path
2021-04-19 11:09:55 -05:00
568b31cf1c
[LYN-2856] EMotionFX: Creating an Anim Graph snapshot crashes the Editor ( #67 )
...
Cherry picking bug fix from 1.0
2021-04-19 18:03:28 +02:00
4c2260af97
Lyn 2651 rebased to main ( #74 )
...
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
2021-04-19 08:51:52 -07:00
febad58c64
LYN-652 to unblock Linux Automated Testing
2021-04-19 10:26:41 -05:00
9412078992
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
...
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
2021-04-19 10:23:58 -05:00
ce6d9e51ee
Merge branch 'main' into sceneapi_script_regression
2021-04-19 09:32:29 -05:00
c367e51462
Added DiffuseProbeGridClassification pass.
2021-04-19 02:30:52 -07:00
007589a98d
Added DiffuseProbeGridClassification pass.
...
Updated RayTracing shaders to use the new light types.
2021-04-19 02:29:20 -07: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
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05: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
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05:00
b3cc14dd5c
disabling source control thumbnails in material editor
2021-04-16 18:59:21 -07: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
dmcdiar
Guthrie Adams
Esteban Papp
cgalvan
Luis Sempé
Chris Galvan
AMZN-mnaumov
jackalbe
lumberyard-employee-dm
Benjamin Jillich
AMZN-stankowi
dmcdiarmid-ly
guthadam
jckand-amzn
Steve Pham
spham
mnaumov
Nicholas Van Sickle
SJ
Vicky
chiyenteng
mcgarrah