Commit Graph

233 Commits

Author SHA1 Message Date
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
mcgarrah 9412078992 Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
2021-04-19 10:23:58 -05:00
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 2021-04-19 09:32:29 -05:00
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 2021-04-19 11:05:10 +01:00
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 2021-04-16 21:12:55 -05:00
Nicholas Van Sickle 944dab2ecb Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
2021-04-16 18:40:38 -07:00
lumberyard-employee-dm 1e80012df1 Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
2021-04-16 20:30:40 -05:00
chiyenteng 41db22be3d [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#103)
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85)
2021-04-16 17:06:58 -07:00
mcgarrah 603ee5bf83 Updated the MergeSettingsToRegistry_AddRuntimeFilePaths to use the default asset platform associated with the OS, if the /Amazon/AzCore/Bootstrap/assets key isn't found in the settings registry 2021-04-16 18:55:08 -05:00
mcgarrah 96ef349931 Update the AzFramework and AzCore cmake files to point at the new location of the PlatformDefaults.h and PlatformDefaults.cpp file
Added an inline namespace for the PlatformDefaults code to ease with aliasing it into the AzFramework namespace
2021-04-16 18:55:06 -05:00
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 2021-04-16 18:55:05 -05:00
mcgarrah 373f60f29c Added a call to update the runtime file paths again after merging all Engine, Gem and Project Settings Registry in case they modified the asset platform key which is used for setting the project cache root 2021-04-16 18:54:58 -05:00
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.
2021-04-16 16:48:22 -07:00
srikappa 22d6e1ec0d Modularized undo instannce update undo operation and enabled setting container entity to be selected 2021-04-16 16:18:34 -07:00
Esteban Papp a6c7815685 SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 2021-04-16 16:06:54 -07:00
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 2021-04-16 15:23:26 -05:00
jackalbe 085aa78ec9 Merge branch 'main' into sceneapi_script_regression 2021-04-16 14:29:47 -05:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
amzn-sean beafc80939 Fixed entities not being deselected when entering game mode in editor.
added protections around physx AZ::Events handlers that are connected/disconnected on selection events.
jira: LYN-2998
2021-04-16 18:37:13 +01:00
Tom Hulton-Harrop 405276a7ae Merge pull request #37 from aws-lumberyard-dev/hultonha_LYN-2528_whitebox_prefab
Add Json serialization support for ByteStream

Fixes serialization issue with the White Box component when Prefabs are enabled.
2021-04-16 18:28:12 +01:00
jjjoness 0854d5d0da Merge pull request #99 from aws-lumberyard-dev/LYN-1901
Lyn 1901
2021-04-16 18:11:15 +01:00