662934afbe
Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only
5 years ago
fd87ffc971
Merge branch 'main' into LYN-1099
5 years ago
bc40dd7e5e
Merge remote-tracking branch 'upstream/main' into DisableAtomShim
5 years ago
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
5 years ago
28170ffe41
Add newlines to the end of all files
5 years ago
2b63ecab87
Merge branch 'main' into LYN-1099
5 years ago
795ce4dfca
Revert accidental change
5 years ago
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
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
8e1eb32de7
[LYN-3160] Fixed python bindings unit test that was still looking for get/set_edit_mode functions.
5 years ago
607f786687
[LYN-3160] Fixed virtual destructor compile issue on linux.
5 years ago
08bd4ee740
[LYN-3160] Removed IEditor::Get/SetEditMode and some additional unused (related) content in the InfoBar.
5 years ago
d680995074
Renamed several non-inclusive terms ( #236 )
5 years ago
012ab89a23
Changed Play Console to right of toolbar.
5 years ago
bfc4a3bb21
fix bug for setting SimpleMotion asset
5 years ago
f750a491c8
remove mistakenly added .orig file
5 years ago
40a35b4e45
Merge remote-tracking branch 'upstream/main' into DisableAtomShim
5 years ago
96bbfb3ff0
Revert disable CryRenderer changes and leave CryRendererNull running. Also delete CryRenderAtomShim
5 years ago
ee90a73744
[LYN-3105] Fixed missing include.
5 years ago
5061f39406
Merge branch 'main' into cgalvan/RemoveLegacyEditTools
5 years ago
0efa1e7817
[LYN-3105] Removed legacy CEditTool class and all sub-classes.
5 years ago
e8cd122b86
Merge pull request #184 from aws-lumberyard-dev/nvsickle/CherryPickMoreViewportFixes
...
Cherry-pick viewport fixes to main
5 years ago
c01174d57f
Merge remote-tracking branch 'upstream/main' into DisableAtomShim
5 years ago
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
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
7e2cbda2d3
Fix viewport display on new level creation
5 years ago
68cc939c6d
Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
...
Fix debug font rendering & assert on game mode transition
5 years ago
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
fbc69e5fd7
[LYN-3079] Removed IPickObjectCallback and edit tools that used it.
5 years ago
22cfe18601
Merge pull request #140 from aws-lumberyard-dev/Editor/RemoveLegacyMaterialEditor
...
[LYN-3070] Removed legacy Material Editor.
5 years ago
6aabf2ee3d
Don't attempt to render manipulators in game mode
5 years ago
e2a7629993
Remove statistics rendering from EditorViewportWidget - it's wrong at the moment, and needs to be moved to a controller
5 years ago
ebf41d2bdf
Update code style
5 years ago
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
482e423ec9
Fix crash on default layout restore
5 years ago
c05d4b44e4
Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues
5 years ago
4fb407e130
[LYN-3070] Removed legacy Material Editor.
5 years ago
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
5 years ago
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
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
5 years ago
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
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
5 years ago
10faddb113
Integrating github/staging through commit ef88e6e
5 years ago
0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
...
Lyn 1901
5 years ago
fece27b1b0
Merge branch 'main' into LY-113714
5 years ago
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
390aa36480
Merge branch 'main' into LYN-1901
5 years ago
11081aeddd
Changed logo to O3DE
5 years ago
f7aabebb37
Fix context menu popping up when it shouldn't
5 years ago
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
5 years ago
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
5 years ago
78e5a069fa
Removed Cry branding on error messages ( #41 )
5 years ago
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
5 years ago
97d0f42671
Enable EditorViewportWidget by default
5 years ago
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
f6e98d5014
Fix viewport context menu hiding cursor and sometimes popping up repeatedly
5 years ago
921eb742d4
Merge branch 'main' into github/staging
5 years ago
a71a5746cc
[LY-113714]
...
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
1c47a26494
Clarify the reason for the default view juggling in SetAsActiveViewport
5 years ago
1dabb39b98
Migrate fixes from CodeCommit branch
5 years ago
c5b955d281
Integrating github/staging through commit b0dd7ed
5 years ago
1044dc3da1
Integrating github/staging through commit ab87ed9
5 years ago
c2cbd430fe
Integrating up through commit 90f050496
5 years ago
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
75dc720198
Integrating latest 47acbe8
5 years ago
a10351f38d
Initial commit
5 years ago
hultonha
jjjoness
rgba16f
Chris Burel
nvsickle
cgalvan
Chris Galvan
Terry Michaels
AMZN-daimini
mcgarrah
alexpete
sphrose
Alex Peterson