Commit Graph

21 Commits

Author SHA1 Message Date
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05:00
nvsickle fb2ca8e02c Fix Editor crash in test teardown calling set_view_pane_layout
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
2021-04-23 00:26:09 -07:00
rgba16f 40a35b4e45 Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-21 20:43:47 -05:00
rgba16f 96bbfb3ff0 Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim 2021-04-21 20:34:38 -05:00
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 2021-04-21 14:54:19 -05:00
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 2021-04-21 13:57:16 -05:00
rgba16f c01174d57f Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-20 19:08:48 -05:00
nvsickle 5ea2240787 Fix editor controls working in game mode
-Implements ResetInputChannels for ViewportController API and SetEnabled for ViewportControllerList
-Disables all viewport controllers while in game mode
2021-04-20 15:27:34 -07:00
nvsickle 7e2cbda2d3 Fix viewport display on new level creation 2021-04-20 15:27:32 -07:00
rgba16f 9de6bdcf2b First pass to remove AtomShim
Removed CryRenderAtomShim folder from Gems/AtomLyIntegration/CMakeLists.txt
Set LOAD_LEGACY_RENDERER_FOR_EDITOR to false
2021-04-20 11:58:55 -05: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 c05d4b44e4 Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues 2021-04-19 15:08:40 -07: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
Alex Peterson 921eb742d4 Merge branch 'main' into github/staging 2021-04-13 09:46:26 -07:00
nvsickle 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport 2021-04-09 14:19:41 -07:00
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 2021-04-09 12:40:43 -07:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00