fbc69e5fd7
[LYN-3079] Removed IPickObjectCallback and edit tools that used it.
2021-04-20 11:08:51 -05:00
22cfe18601
Merge pull request #140 from aws-lumberyard-dev/Editor/RemoveLegacyMaterialEditor
...
[LYN-3070] Removed legacy Material Editor.
2021-04-20 10:26:57 -05:00
4fb407e130
[LYN-3070] Removed legacy Material Editor.
2021-04-19 15:39:50 -05:00
7f169855f3
Merge branch 'main' into cgalvan/EntityHelperRefactor
2021-04-19 13:18:27 -05:00
06d6ab9715
[LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback.
2021-04-19 12:29:58 -05:00
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05:00
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
6dadc84581
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot
2021-04-16 15:23:26 -05:00
10faddb113
Integrating github/staging through commit ef88e6e
2021-04-16 12:05:11 -07:00
0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
...
Lyn 1901
2021-04-16 18:11:15 +01:00
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
2021-04-15 22:40:58 -05:00
390aa36480
Merge branch 'main' into LYN-1901
2021-04-15 11:08:04 +01:00
11081aeddd
Changed logo to O3DE
2021-04-15 11:01:08 +01:00
f7aabebb37
Fix context menu popping up when it shouldn't
2021-04-14 17:03:21 -07:00
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
2021-04-14 15:47:56 -07:00
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
2021-04-14 16:01:26 -05:00
78e5a069fa
Removed Cry branding on error messages ( #41 )
2021-04-14 14:31:44 -05:00
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
2021-04-14 10:47:18 -07:00
97d0f42671
Enable EditorViewportWidget by default
2021-04-14 10:45:54 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
f6e98d5014
Fix viewport context menu hiding cursor and sometimes popping up repeatedly
2021-04-13 11:08:22 -07:00
921eb742d4
Merge branch 'main' into github/staging
2021-04-13 09:46:26 -07:00
1c47a26494
Clarify the reason for the default view juggling in SetAsActiveViewport
2021-04-09 14:19:41 -07:00
1dabb39b98
Migrate fixes from CodeCommit branch
2021-04-09 12:40:43 -07:00
c5b955d281
Integrating github/staging through commit b0dd7ed
2021-04-09 12:03:26 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Galvan
cgalvan
mcgarrah
nvsickle
alexpete
jjjoness
Terry Michaels
Alex Peterson