Commit Graph

350 Commits

Author SHA1 Message Date
nvsickle dee0f84704 Clarified lazy initialization and added some thread sanity logic after discussion with @rgba16f 2021-04-19 17:00:36 -07:00
nvsickle 6aabf2ee3d Don't attempt to render manipulators in game mode 2021-04-19 15:36:25 -07:00
nvsickle e2a7629993 Remove statistics rendering from EditorViewportWidget - it's wrong at the moment, and needs to be moved to a controller 2021-04-19 15:24:08 -07:00
nvsickle ebf41d2bdf Update code style 2021-04-19 15:13:10 -07:00
nvsickle dd7334471f Fix comment punctuation 2021-04-19 15:13:08 -07:00
nvsickle d2fadcb0e3 Fix context menu handling in multi-viewport scenarios (the logic bugs here were many and nuanced, but we're narrowing in on something robust).
Specifically this:
-Ensures key/mouse up event propagation works across multiple viewports
-Ensures that mouse up events for manipulators only get delivered if there's a corresponding mouse down event
-Also tidies up the "are we done processing events this tick?" logic in ViewportManipulatorController
2021-04-19 15:13:06 -07:00
nvsickle 482e423ec9 Fix crash on default layout restore 2021-04-19 15:13:04 -07:00
nvsickle c05d4b44e4 Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues 2021-04-19 15:08:40 -07:00
nvsickle 8fc69113c9 Get the default viewport context on demand in FFont, as it may change 2021-04-19 15:08:06 -07:00
AMZN-mnaumov 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
jackalbe 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
lumberyard-employee-dm 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
jackalbe 5c3e5aa7db removing all to_lower() 2021-04-19 11:26:15 -05:00
jackalbe 387dd1e43a normalizing Linux path 2021-04-19 11:09:55 -05:00
Benjamin Jillich 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
AMZN-stankowi 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
jackalbe febad58c64 LYN-652 to unblock Linux Automated Testing 2021-04-19 10:26:41 -05:00
mcgarrah 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
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 2021-04-19 09:32:29 -05:00
dmcdiarmid-ly 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
dmcdiar 46b9f1934d Removed commented line 2021-04-18 23:15:02 -07:00
dmcdiar 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
jckand-amzn 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
Steve Pham 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
spham 287a163af2 Merge branch 'main' into platform/SPEC-6061 2021-04-16 21:32:08 -07:00
lumberyard-employee-dm 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
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 2021-04-16 21:12:55 -05:00
mnaumov b3cc14dd5c disabling source control thumbnails in material editor 2021-04-16 18:59:21 -07:00
Nicholas Van Sickle 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
lumberyard-employee-dm 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
mcgarrah 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
spham aaf2200122 Merge branch 'main' into platform/SPEC-6061 2021-04-16 17:58:49 -07:00
SJ f5044ae08e Merge pull request #81 from aws-lumberyard-dev/LYN-2893 2021-04-16 17:56:31 -07:00
Vicky 3d337add5c SPEC-6397 Mismatched type in ImGuiGpuProfiler during OSX asset builds
Fixed Mac compile issue.
2021-04-16 17:43:36 -07:00
chiyenteng 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
mcgarrah 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
mcgarrah 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
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 2021-04-16 18:55:05 -05:00
lumberyard-employee-dm 6b1e2c52b1 Adding newline at end of file of bootstrap.cfg 2021-04-16 18:54:59 -05:00
mcgarrah 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
mcgarrah 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
nvsickle 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
Esteban Papp 250f8d8db0 SPEC-6246 Prevent job overrides from PR branches (#110) 2021-04-16 16:36:21 -07:00
amzn-sj b38449ffaa Merge branch 'main' into LYN-2893 2021-04-16 16:21:36 -07:00
AMZN-mnaumov 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
Esteban Papp 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
Vicky 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
amzn-sj 73f275f479 Get FindOpenGLInterface to use ly_add_external_target() instead 2021-04-16 15:37:26 -07:00
Guthrie Adams 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
Alex Peterson 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