Commit Graph

252 Commits

Author SHA1 Message Date
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
srikappa 78892c8d7e Improved a couple of comments 2021-04-20 14:30:56 -07:00
pereslav 465546a6e4 Merge branch 'main' into MultiplayerPipeline 2021-04-20 22:11:52 +01:00
SJ 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
Mike Balfour 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
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
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 2021-04-20 12:16:40 -07:00
AMZN-mnaumov 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
mbalfour d9fe89ba56 Addressed feedback - made string& into a string_view. 2021-04-20 13:37:10 -05:00
AMZN-mnaumov 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
Aristo7 c07c57ca2a Revert "Removed HLSL cry compilers and tools"
This reverts commit f8a72e5a04.
2021-04-20 12:53:46 -05:00
Aristo7 8410452067 Revert "Removing hlsl refs in cmake build files"
This reverts commit 7b42402b18.
2021-04-20 12:53:03 -05:00
Aristo7 2a59b7e0e6 Revert "Linux/mac hlsl header refs removed"
This reverts commit 6f33e1404e.
2021-04-20 12:52:40 -05:00
Aristo7 6f33e1404e Linux/mac hlsl header refs removed 2021-04-20 12:27:05 -05: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
Aristo7 7b42402b18 Removing hlsl refs in cmake build files 2021-04-20 11:54:31 -05:00
greerdv 2d1ba34f8c Merge branch 'main' into non-uniform-scale-mesh 2021-04-20 17:43:08 +01:00
greerdv 12cbba5fad adding test for Aabb::MultiplyByScale 2021-04-20 17:42:38 +01:00
Chris Galvan fbc69e5fd7 [LYN-3079] Removed IPickObjectCallback and edit tools that used it. 2021-04-20 11:08:51 -05:00
Aristo7 f8a72e5a04 Removed HLSL cry compilers and tools 2021-04-20 11:05:01 -05:00
cgalvan 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
mbalfour 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
mbalfour 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
greerdv cc937e0809 feedback from PR 2021-04-20 14:44:31 +01:00
greerdv fd8b42c45e Merge branch 'main' into non-uniform-scale-mesh 2021-04-20 10:29:55 +01:00
greerdv f0ae8056c8 feedback from PR 2021-04-20 10:25:19 +01:00
AMZN-daimini 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
mnaumov 7e48bee48f Fixing thumbnail pixelation 2021-04-19 18:24:23 -07:00
srikappa 967d182ccc Fixed a couple of typos 2021-04-19 17:29:03 -07:00
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 2021-04-19 17:26:53 -07: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
mnaumov 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
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
srikappa 707f7cb6ce Added some comments 2021-04-19 15:06:41 -07:00
srikappa 8bc2998d82 Merge branch 'main' into Prefab/CreatePrefab 2021-04-19 13:50:52 -07:00
srikappa 65b2d9de1b Added couple of helper functions 2021-04-19 13:43:54 -07:00
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 2021-04-19 15:39:50 -05:00
Olex Lozitskiy 08ed726faa Deleted CrySCompileServer 2021-04-19 15:52:13 -04:00
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 2021-04-19 13:18:27 -05:00
srikappa f3ff5ec886 Add helper method for adding link in CreatePrefab 2021-04-19 11:05:28 -07:00
Chris Galvan 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
jackalbe a7f5462f3d Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
2021-04-19 12:07:32 -05:00
srikappa 889158e3a9 A couple of minor fixes 2021-04-19 09:53:45 -07:00
lumberyard-employee-dm d6788996fc Merge pull request #130 from aws-lumberyard-dev/LYN-3055
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
2021-04-19 11:52:16 -05:00
AMZN-stankowi 4c2260af97 Lyn 2651 rebased to main (#74)
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
2021-04-19 08:51:52 -07:00