62a3b7635b
Merge branch 'main' into non-uniform-scale-mesh
2021-04-21 10:56:36 +01:00
bfa964a23e
Moved TabWidget grab animation to mouse press to match fancy docking behavior, fixed missed mouse up cursor restore
2021-04-21 10:19:12 +01:00
5f4275336c
Fixing deadlock related to thumbnails
...
Adding smoothing to thumbnails in AssetBrowser
2021-04-20 20:05:32 -07:00
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
c01174d57f
Merge remote-tracking branch 'upstream/main' into DisableAtomShim
2021-04-20 19:08:48 -05:00
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
f8c5048b56
Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
2021-04-20 15:42:05 -07:00
4f9d7e3782
Simplify ResetInputChannels
2021-04-20 15:27:38 -07:00
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
7e2cbda2d3
Fix viewport display on new level creation
2021-04-20 15:27:32 -07:00
78892c8d7e
Improved a couple of comments
2021-04-20 14:30:56 -07:00
465546a6e4
Merge branch 'main' into MultiplayerPipeline
2021-04-20 22:11:52 +01:00
3df1ffe3b7
3rd Party static libraries need to be public dependencies to work from installed engine.
...
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
2021-04-20 14:11:08 -07:00
6c65d5f666
Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext
...
Expose some helpful methods to BehaviorContext
2021-04-20 15:58:08 -05:00
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
f53c1e8084
3rd Party static libraries need to be public dependencies to work from installed engine.
2021-04-20 12:16:40 -07:00
f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
...
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
d9fe89ba56
Addressed feedback - made string& into a string_view.
2021-04-20 13:37:10 -05:00
3994d80c7e
Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
...
[ATOM-15271] Fixing thumbnail pixelation
2021-04-20 11:37:02 -07:00
c07c57ca2a
Revert "Removed HLSL cry compilers and tools"
...
This reverts commit f8a72e5a04
2021-04-20 12:53:46 -05:00
8410452067
Revert "Removing hlsl refs in cmake build files"
...
This reverts commit 7b42402b18
2021-04-20 12:53:03 -05:00
2a59b7e0e6
Revert "Linux/mac hlsl header refs removed"
...
This reverts commit 6f33e1404e
2021-04-20 12:52:40 -05:00
c2a6addf1f
Integrating latest from github/TIF/Runtime
2021-04-20 10:42:39 -07:00
6f33e1404e
Linux/mac hlsl header refs removed
2021-04-20 12:27:05 -05:00
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
7b42402b18
Removing hlsl refs in cmake build files
2021-04-20 11:54:31 -05:00
2d1ba34f8c
Merge branch 'main' into non-uniform-scale-mesh
2021-04-20 17:43:08 +01:00
12cbba5fad
adding test for Aabb::MultiplyByScale
2021-04-20 17:42:38 +01:00
b1d8330870
Review fixes.
2021-04-20 17:20:19 +01:00
fbc69e5fd7
[LYN-3079] Removed IPickObjectCallback and edit tools that used it.
2021-04-20 11:08:51 -05:00
f8a72e5a04
Removed HLSL cry compilers and tools
2021-04-20 11:05:01 -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
e8459898a7
Exposed Quaternion::CreateFromEulerAnglesDegrees and Transform::Transform(Vector3, Quaternion, Vector3) to the behavior context to improve usability of these classes from scripts.
...
(cherry picked from commit 8156beb21181f9ff20972c8ea8be5e3dc61f1700)
2021-04-20 09:08:40 -05:00
33e61ad35b
Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts.
...
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
2021-04-20 09:08:19 -05:00
cc937e0809
feedback from PR
2021-04-20 14:44:31 +01:00
fd8b42c45e
Merge branch 'main' into non-uniform-scale-mesh
2021-04-20 10:29:55 +01:00
f0ae8056c8
feedback from PR
2021-04-20 10:25:19 +01:00
7901fe8625
Reset the whole Qt model when an entry in the EditorEntityModel is removed. ( #48 ) ( #82 )
...
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.
Co-authored-by: Shirang Jia <shiranj@amazon.com >
Co-authored-by: Shirang Jia <shiranj@amazon.com >
2021-04-19 21:52:10 -07:00
7e48bee48f
Fixing thumbnail pixelation
2021-04-19 18:24:23 -07:00
967d182ccc
Fixed a couple of typos
2021-04-19 17:29:03 -07:00
8d94f45b19
Merge branch 'main' into Prefab/CreatePrefab
2021-04-19 17:26:53 -07:00
6aabf2ee3d
Don't attempt to render manipulators in game mode
2021-04-19 15:36:25 -07:00
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
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
ebf41d2bdf
Update code style
2021-04-19 15:13:10 -07:00
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
482e423ec9
Fix crash on default layout restore
2021-04-19 15:13:04 -07:00
c05d4b44e4
Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues
2021-04-19 15:08:40 -07:00
707f7cb6ce
Added some comments
2021-04-19 15:06:41 -07:00
8bc2998d82
Merge branch 'main' into Prefab/CreatePrefab
2021-04-19 13:50:52 -07:00
greerdv
sphrose
mnaumov
Nicholas Van Sickle
rgba16f
AMZN-daimini
srikappa-amzn
srikappa
pereslav
SJ
Mike Balfour
AMZN-mnaumov
mbalfour
Aristo7
alexpete
Chris Galvan
cgalvan