Commit Graph

74 Commits

Author SHA1 Message Date
jjjoness 88dcaba8da Merge pull request #317 from aws-lumberyard-dev/LYN-1099
Lyn 1099
2021-04-28 16:16:04 +01:00
cgalvan 60d876a05e Merge pull request #375 from aws-lumberyard-dev/cgalvan/ReplaceGetSelectedEntitiesSize
[LYN-3356] Replaced GetSelectedEntities + size() with new API.
2021-04-28 10:07:07 -05:00
jjjoness 1fd6938519 Replaced missing & 2021-04-28 08:56:02 +01:00
Chris Galvan 8e88d746a3 [LYN-3356] Replaced GetSelectedEntities + size() with new API. 2021-04-27 16:56:20 -05:00
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 2021-04-27 15:16:20 -05:00
jjjoness 0607f6efa6 Changed Play Console from comments in PR. 2021-04-27 18:37:14 +01:00
Aaron Ruiz Mora 00fca9489c Fix editor crashing by protecting gEnv->g3DEngine 2021-04-27 14:52:10 +01:00
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-27 11:41:13 +01:00
jjjoness 275d99359d Merge branch 'main' into LYN-1099 2021-04-27 09:43:05 +01:00
mbalfour f76b69d480 Added a handful of null checks to let new level creation succeed. 2021-04-26 16:15:25 -05:00
bosnichd e5b5067748 Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false (#315)
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false, and added some null checks to protect against gEnv->pRenderer and gEnv->p3DEngine now being null in the editor as well as the launcher.
2021-04-26 13:15:32 -06:00
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 2021-04-26 11:49:48 -05:00
jjjoness 734cd63494 Merge branch 'main' into LYN-1099 2021-04-26 15:44:45 +01:00
AMZN-AlexOteiza 3f32cc929c Fixed All Physics automated tests (#129)
* Fixed all Tests.
* Fixed tests stdout redirection
* Changed return code for failed tests to be 0xF
* Small improvements on automated testing code
* Created Periodic test suite and moved tests
* Made physics main to only have one test for now
* Renamed all tests to have leading AutomatedTesting::
2021-04-26 15:25:34 +01:00
jjjoness 73df05529c Completed new Play Console button. 2021-04-26 13:59:05 +01:00
hultonha 662934afbe Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 2021-04-26 10:03:23 +01:00
jjjoness fd87ffc971 Merge branch 'main' into LYN-1099 2021-04-25 10:27:14 +01:00
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-23 18:35:18 -05:00
Chris Burel 61fe298319 Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
Chris Burel 28170ffe41 Add newlines to the end of all files 2021-04-23 09:43:40 -07:00
jjjoness 2b63ecab87 Merge branch 'main' into LYN-1099 2021-04-23 09:55:17 +01:00
nvsickle 795ce4dfca Revert accidental change 2021-04-23 00:26:11 -07: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
cgalvan 5d3774521f Merge pull request #251 from aws-lumberyard-dev/cgalvan/RemoveSetEditMode
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
2021-04-22 16:36:57 -05:00
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 2021-04-22 15:22:44 -05:00
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 2021-04-22 15:00:50 -05:00
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 2021-04-22 14:28:42 -05:00
Terry Michaels d680995074 Renamed several non-inclusive terms (#236) 2021-04-22 13:31:26 -05:00
jjjoness 012ab89a23 Changed Play Console to right of toolbar. 2021-04-22 15:45:55 +01:00
hultonha bfc4a3bb21 fix bug for setting SimpleMotion asset 2021-04-22 13:57:03 +01:00
rgba16f f750a491c8 remove mistakenly added .orig file 2021-04-21 20:46:28 -05: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
Nicholas Van Sickle e8cd122b86 Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
2021-04-20 19:45:01 -07:00
rgba16f c01174d57f Merge remote-tracking branch 'upstream/main' into DisableAtomShim 2021-04-20 19:08:48 -05:00
AMZN-daimini 62bc7a66bb Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
2021-04-20 16:22:34 -07: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
Nicholas Van Sickle 68cc939c6d Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
2021-04-20 12:32:26 -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
Chris Galvan fbc69e5fd7 [LYN-3079] Removed IPickObjectCallback and edit tools that used it. 2021-04-20 11:08:51 -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 ebf41d2bdf Update code style 2021-04-19 15:13:10 -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
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 2021-04-19 15:39:50 -05:00