Commit Graph

4039 Commits (1431afb51a08535a0ceabc22f11a55c0e5f5bb93)

Author SHA1 Message Date
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)
5 years ago
mbalfour 33e61ad35b Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts.
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
5 years ago
greerdv cc937e0809 feedback from PR 5 years ago
greerdv fd8b42c45e Merge branch 'main' into non-uniform-scale-mesh 5 years ago
greerdv f0ae8056c8 feedback from PR 5 years ago
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>
5 years ago
mnaumov 7e48bee48f Fixing thumbnail pixelation 5 years ago
srikappa 967d182ccc Fixed a couple of typos 5 years ago
srikappa 8d94f45b19 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
nvsickle 6aabf2ee3d Don't attempt to render manipulators in game mode 5 years ago
nvsickle e2a7629993 Remove statistics rendering from EditorViewportWidget - it's wrong at the moment, and needs to be moved to a controller 5 years ago
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor
Improving MaterialBrowser filter to show empty folders
5 years ago
nvsickle ebf41d2bdf Update code style 5 years ago
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
5 years ago
nvsickle 482e423ec9 Fix crash on default layout restore 5 years ago
nvsickle c05d4b44e4 Move supplemental EditorViewportWidget rendering to OnBeginPrepareRender to avoid sync issues 5 years ago
srikappa 707f7cb6ce Added some comments 5 years ago
srikappa 8bc2998d82 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 65b2d9de1b Added couple of helper functions 5 years ago
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 5 years ago
Olex Lozitskiy 08ed726faa Deleted CrySCompileServer 5 years ago
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 5 years ago
srikappa f3ff5ec886 Add helper method for adding link in CreatePrefab 5 years ago
Chris Galvan 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
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
5 years ago
srikappa 889158e3a9 A couple of minor fixes 5 years ago
lumberyard-employee-dm d6788996fc
Merge pull request #130 from aws-lumberyard-dev/LYN-3055
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
5 years ago
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.
5 years ago
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
5 years ago
sphrose 2dbd9e4a05 Changed to use direct line drawing rather than adding svg. 5 years ago
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 5 years ago
jjjoness 1c151e6a75 Merge branch 'main' into LYN-1932 5 years ago
greerdv e497b7ac33 Merge branch 'main' into non-uniform-scale-mesh 5 years ago
jjjoness 7e85cdd045 Part 1 of changing colors to O3DE. 5 years ago
mcgarrah 6d3b9e4f51 Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot 5 years ago
Nicholas Van Sickle 944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
5 years ago
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.
5 years ago
chiyenteng 41db22be3d
[CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#103)
* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85)
5 years ago
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 5 years ago
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
5 years ago
mcgarrah bf2732a26d Moved the PlatformDefaults files from AzFramework to AzCore 5 years ago
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 5 years ago
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.
5 years ago
srikappa 22d6e1ec0d Modularized undo instannce update undo operation and enabled setting container entity to be selected 5 years ago
Esteban Papp a6c7815685
SPEC-6371 Change the asset_profile and test_profile steps to be no_unity so it doesnt recompile 5 years ago
mcgarrah 6dadc84581 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into LYN-2726-ProjectRoot 5 years ago
jackalbe 085aa78ec9 Merge branch 'main' into sceneapi_script_regression 5 years ago
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 5 years ago
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
5 years ago
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.
5 years ago
jjjoness 0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
Lyn 1901
5 years ago
karlberg a59e212134 Merge branch 'main' into MultiplayerPipeline 5 years ago
hasareej f6fc8f95a9 Fixed random button highlights & toolbar order. 5 years ago
sphrose 2a339edc4e [LY-105687]
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687

Renamed svg
5 years ago
amzn-sean 2a53f018fa
Merge pull request #70 from aws-lumberyard-dev/physx_system_comp
SystemComponent is now only built once in the PhysX.Static target
5 years ago
hultonha 102a0e5dc8 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
hasareej 969f94ffb5 Initial pass of ViewportUiSwitcher. 5 years ago
sphrose fece27b1b0 Merge branch 'main' into LY-113714 5 years ago
greerdv a757d327a0 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
mcgarrah 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
srikappa 1cf2e11cd3 Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 0b29e4ffea Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 778d60bd0c Replaced unique instance queue with checks in template to instance mapper 5 years ago
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 5 years ago
karlberg 0ce18593d2 Merging latest main 5 years ago
kberg-amzn c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
5 years ago
pereslav 4962218d29 Refactored root spawnable instantiation, added selective instantiation of root spawnable entities 5 years ago
srikappa-amzn 76af009190
Merge pull request #72 from aws-lumberyard-dev/Prefab/RelativePathForNewPrefabs
Make creation of new prefabs use a relative path to the project
5 years ago
Terry Michaels 020d7801bb
Make sure Recent Files list is correctly enabled/disabled when the list changes (#73)
Make sure Recent Files list is correctly enabled/disabled when the recent files list changes
5 years ago
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 5 years ago
Nicholas Van Sickle 2f698626cf
Merge pull request #64 from aws-lumberyard-dev/nvsickle/CherryPickContextMenuFix
Cherry-pick: Fix context menu popping up in EditorViewportWidget when it shouldn't
5 years ago
jackalbe 0997a2cfbf Merge branch 'main' into sceneapi_script_regression 5 years ago
jackalbe 80f8c0f68b behavior context class SceneGraph::NodeIndex -> "NodeIndex" 5 years ago
srikappa c63f09adce Merge branch 'main' into Prefab/CreatePrefab 5 years ago
srikappa 4da29a09d2 Merge branch 'main' into Prefab/RelativePathForNewPrefabs 5 years ago
hultonha 9d84fdcb23 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 10ab7666db Merge branch 'main' into limit_max_scale 5 years ago
amzn-sean 23cf2d5d68 SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects. 5 years ago
jjjoness 390aa36480 Merge branch 'main' into LYN-1901 5 years ago
jjjoness 11081aeddd Changed logo to O3DE 5 years ago
hultonha 7c5f7181eb updates following review feedback - remove explicit resize and update concrete type to alias 5 years ago
greerdv 4c582a2b0a Merge branch 'main' into non-uniform-scale-mesh 5 years ago
greerdv d8169e08fb merging from main 5 years ago
srikappa b6492121ca Merge branch 'main' into Prefab/CreatePrefab 5 years ago
lumberyard-employee-dm 8019312b35
Merge pull request #28 from aws-lumberyard-dev/LYN-2883
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
5 years ago
srikappa 2410d299c1 Make creation of new prefabs use a relative path to the project 5 years ago
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
srikappa a371edd07f Initial commit of CreatePrefab work 5 years ago
nvsickle f7aabebb37 Fix context menu popping up when it shouldn't 5 years ago
SJ 03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295
[iOS] Fix build issues
5 years ago
Nicholas Van Sickle 7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
Switch on the Atom-native viewport by default
5 years ago
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 5 years ago
amzn-sj 7609248c49 Fix build errors 5 years ago
SergeyAMZN 828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
Fixed dangling pointer in InitializeCatalog
5 years ago
Chris Galvan 0f13a71bd2 [LYN-2255] Refactored some EditorEntityHelpers so they can be re-used. 5 years ago
Terry Michaels 78e5a069fa
Removed Cry branding on error messages (#41) 5 years ago
Esteban Papp 90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 5 years ago
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 5 years ago
nvsickle 97d0f42671 Enable EditorViewportWidget by default 5 years ago
greerdv 217009de2b adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation 5 years ago
Mike Balfour efe5715e68
Merge branch 'main' into mbalfour/spec-6178 5 years ago
sphrose a947007861 Darken line 5 years ago
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 5 years ago
greerdv 2fb2813b48 updating atom mesh component to support non-uniform scale component 5 years ago
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 5 years ago
hultonha 9c8fd1f9e4 Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab 5 years ago
hultonha e1e746066d add some preliminary tests for ByteStreamSerializer 5 years ago
hultonha 2655aaa633 update ByteStreamSerializer to use Base64 encoding 5 years ago
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 5 years ago
mcgarrah 957945f809 Clarified the error message that is output when the project.json is not found 5 years ago
mcgarrah 92b8e590ce Added better error message around when the Unified Launcher target for a Project cannot be configured due to issues querying the project name from the provided project path 5 years ago
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 5 years ago
mbalfour d7f10e9d60 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets.
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById

This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.

As a bonus, this also removes the blocking load call.  The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
5 years ago
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 5 years ago
Alex Peterson 921eb742d4
Merge branch 'main' into github/staging 5 years ago
sphrose a71a5746cc [LY-113714]
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
jackalbe 442e15a414 Merge branch 'main' into sceneapi_script_autotest 5 years ago
hultonha 063b8a6d54 update some reinterpret_cast calls to static_cast 5 years ago
hultonha 8846e159e0 Add new ByteStream serializer to support storing binary data in json (for now) 5 years ago
greerdv 2313471ab9 Merge branch 'main' into non-uniform-scale-visibility 5 years ago
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 5 years ago
jackalbe 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest 5 years ago
Nicholas Van Sickle 22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes 5 years ago
jackalbe 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename

Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
5 years ago
Alex Peterson cd12226849
Merge branch 'main' into github/staging 5 years ago
alexpete b8e508c2ee Cherrypicking MeshCompiler fix 5 years ago
greerdv 8ee92978f4 setting max value for scale 5 years ago
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 5 years ago
nvsickle 1c47a26494 Clarify the reason for the default view juggling in SetAsActiveViewport 5 years ago
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 5 years ago
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 5 years ago
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 5 years ago
alexpete c2cbd430fe Integrating up through commit 90f050496 5 years ago
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 5 years ago
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
5 years ago
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
5 years ago
alexpete 75dc720198 Integrating latest 47acbe8 5 years ago
alexpete a10351f38d Initial commit 5 years ago