Commit Graph

68 Commits (d433cd623becb2606ff764bb67a4f11b86ea280c)

Author SHA1 Message Date
Chris Galvan 21d99ea07d [LYN-3348] Removed legacy CObjectPhysicsManager. 5 years ago
Aaron Ruiz Mora 00fca9489c
Fix editor crashing by protecting gEnv->g3DEngine 5 years ago
hultonha b85c5f42ed Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
mbalfour f76b69d480 Added a handful of null checks to let new level creation succeed. 5 years ago
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.
5 years ago
Chris Galvan 9d57095e1c [LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API. 5 years ago
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::
5 years ago
hultonha 662934afbe Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only 5 years ago
rgba16f bc40dd7e5e Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
Chris Burel 61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
Add newlines to the end of all files
5 years ago
Chris Burel 28170ffe41 Add newlines to the end of all files 5 years ago
nvsickle 795ce4dfca Revert accidental change 5 years ago
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.
5 years ago
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.
5 years ago
Chris Galvan 8e1eb32de7 [LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions. 5 years ago
Chris Galvan 607f786687 [LYN-3160] Fixed virtual destructor compile issue on linux. 5 years ago
Chris Galvan 08bd4ee740 [LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar. 5 years ago
Terry Michaels d680995074
Renamed several non-inclusive terms (#236) 5 years ago
hultonha bfc4a3bb21 fix bug for setting SimpleMotion asset 5 years ago
rgba16f f750a491c8 remove mistakenly added .orig file 5 years ago
rgba16f 40a35b4e45 Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
rgba16f 96bbfb3ff0 Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim 5 years ago
Chris Galvan ee90a73744 [LYN-3105] Fixed missing include. 5 years ago
Chris Galvan 5061f39406 Merge branch 'main' into cgalvan/RemoveLegacyEditTools 5 years ago
Chris Galvan 0efa1e7817 [LYN-3105] Removed legacy CEditTool class and all sub-classes. 5 years ago
Nicholas Van Sickle e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
Cherry-pick viewport fixes to main
5 years ago
rgba16f c01174d57f Merge remote-tracking branch 'upstream/main' into DisableAtomShim 5 years ago
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
5 years ago
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
5 years ago
nvsickle 7e2cbda2d3 Fix viewport display on new level creation 5 years ago
Nicholas Van Sickle 68cc939c6d
Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
5 years ago
rgba16f 9de6bdcf2b First pass to remove AtomShim
Removed CryRenderAtomShim folder from Gems/AtomLyIntegration/CMakeLists.txt
Set LOAD_LEGACY_RENDERER_FOR_EDITOR to false
5 years ago
Chris Galvan fbc69e5fd7 [LYN-3079] Removed IPickObjectCallback and edit tools that used it. 5 years ago
cgalvan 22cfe18601
Merge pull request #140 from aws-lumberyard-dev/Editor/RemoveLegacyMaterialEditor
[LYN-3070] Removed legacy Material Editor.
5 years ago
nvsickle 6aabf2ee3d Don't attempt to render manipulators in game mode 5 years ago
nvsickle e2a7629993 Remove statistics rendering from EditorViewportWidget - it's wrong at the moment, and needs to be moved to a controller 5 years ago
nvsickle ebf41d2bdf Update code style 5 years ago
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
5 years ago
nvsickle 482e423ec9 Fix crash on default layout restore 5 years ago
nvsickle c05d4b44e4 Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues 5 years ago
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
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.
5 years ago
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
Lyn 1901
5 years ago
mcgarrah bff55bd688 LYN-2726 Updated the Settings Registry Merge Utils logic to determine
the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry

The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
   Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
   if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
   the Settings Registry which can override the
   '/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
   directory to determine the project path
4. Finally if a command line parameter that overrides the project path
   is supplied it is used instead
5 years ago
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago