0854d5d0da
Merge pull request #99 from aws-lumberyard-dev/LYN-1901
...
Lyn 1901
5 years ago
a59e212134
Merge branch 'main' into MultiplayerPipeline
5 years ago
f6fc8f95a9
Fixed random button highlights & toolbar order.
5 years ago
2a339edc4e
[LY-105687]
...
Jira: LY-105687
https://jira.agscollab.com/browse/LY-105687
Renamed svg
5 years ago
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
102a0e5dc8
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
969f94ffb5
Initial pass of ViewportUiSwitcher.
5 years ago
fece27b1b0
Merge branch 'main' into LY-113714
5 years ago
a757d327a0
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
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
1cf2e11cd3
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
0b29e4ffea
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
778d60bd0c
Replaced unique instance queue with checks in template to instance mapper
5 years ago
8074e0fb18
Remove formal template parameter name to resolve shadowed variable warning on clang
5 years ago
0ce18593d2
Merging latest main
5 years ago
c2f9019f7c
Merge pull request #65 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components
5 years ago
4962218d29
Refactored root spawnable instantiation, added selective instantiation of root spawnable entities
5 years ago
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
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
a5fdbddeda
Merged MultiplayerPipeline from CodeCommit
5 years ago
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
0997a2cfbf
Merge branch 'main' into sceneapi_script_regression
5 years ago
80f8c0f68b
behavior context class SceneGraph::NodeIndex -> "NodeIndex"
5 years ago
c63f09adce
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
4da29a09d2
Merge branch 'main' into Prefab/RelativePathForNewPrefabs
5 years ago
9d84fdcb23
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
3bbef11d15
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
10ab7666db
Merge branch 'main' into limit_max_scale
5 years ago
23cf2d5d68
SystemComponent is now only build in PhysX.Static, instead of most of the Physx projects.
5 years ago
390aa36480
Merge branch 'main' into LYN-1901
5 years ago
11081aeddd
Changed logo to O3DE
5 years ago
7c5f7181eb
updates following review feedback - remove explicit resize and update concrete type to alias
5 years ago
4c582a2b0a
Merge branch 'main' into non-uniform-scale-mesh
5 years ago
d8169e08fb
merging from main
5 years ago
b6492121ca
Merge branch 'main' into Prefab/CreatePrefab
5 years ago
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
2410d299c1
Make creation of new prefabs use a relative path to the project
5 years ago
88120999f9
Merge remote-tracking branch 'origin' into MultiplayerComponents
5 years ago
a371edd07f
Initial commit of CreatePrefab work
5 years ago
f7aabebb37
Fix context menu popping up when it shouldn't
5 years ago
03aaf33b6e
Merge pull request #62 from aws-lumberyard-dev/SPEC-6295
...
[iOS] Fix build issues
5 years ago
7484a983b8
Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
...
Switch on the Atom-native viewport by default
5 years ago
d29fe24396
Merge remote-tracking branch 'upstream/main' into LYN-2883
5 years ago
7609248c49
Fix build errors
5 years ago
828bedf7a9
Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed dangling pointer in InitializeCatalog
5 years ago
0f13a71bd2
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
5 years ago
78e5a069fa
Removed Cry branding on error messages ( #41 )
5 years ago
90ad9f5141
SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD
5 years ago
bf0db7a3c6
Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport
5 years ago
97d0f42671
Enable EditorViewportWidget by default
5 years ago
217009de2b
adding tests for transforming Aabb with Matrix3x4 and fixing bug in implementation
5 years ago
efe5715e68
Merge branch 'main' into mbalfour/spec-6178
5 years ago
a947007861
Darken line
5 years ago
a7a22bfcc0
Merge branch 'main' into sceneapi_script_autotest
5 years ago
2fb2813b48
updating atom mesh component to support non-uniform scale component
5 years ago
59252235d5
Fixed dangling pointer in InitializeCatalog
5 years ago
9c8fd1f9e4
Merge branch 'main' into hultonha_LYN-2528_whitebox_prefab
5 years ago
e1e746066d
add some preliminary tests for ByteStreamSerializer
5 years ago
2655aaa633
update ByteStreamSerializer to use Base64 encoding
5 years ago
ca3df5d6c8
Various bug fixes to get entity replication working
5 years ago
957945f809
Clarified the error message that is output when the project.json is not found
5 years ago
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
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
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
f6e98d5014
Fix viewport context menu hiding cursor and sometimes popping up repeatedly
5 years ago
921eb742d4
Merge branch 'main' into github/staging
5 years ago
a71a5746cc
[LY-113714]
...
Jira: LY-113714
https://jira.agscollab.com/browse/LY-113714
5 years ago
442e15a414
Merge branch 'main' into sceneapi_script_autotest
5 years ago
063b8a6d54
update some reinterpret_cast calls to static_cast
5 years ago
8846e159e0
Add new ByteStream serializer to support storing binary data in json (for now)
5 years ago
2313471ab9
Merge branch 'main' into non-uniform-scale-visibility
5 years ago
90e52d69bc
fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs
5 years ago
63c97d6d3c
Merge branch 'main' into sceneapi_script_autotest
5 years ago
22684af141
Merge branch 'main' into nvsickle/EditorViewportWidgetFixes
5 years ago
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
cd12226849
Merge branch 'main' into github/staging
5 years ago
b8e508c2ee
Cherrypicking MeshCompiler fix
5 years ago
8ee92978f4
setting max value for scale
5 years ago
51f1183ff4
making scale gizmo apply uniform scale to transform
5 years ago
1c47a26494
Clarify the reason for the default view juggling in SetAsActiveViewport
5 years ago
1dabb39b98
Migrate fixes from CodeCommit branch
5 years ago
c5b955d281
Integrating github/staging through commit b0dd7ed
5 years ago
1044dc3da1
Integrating github/staging through commit ab87ed9
5 years ago
c2cbd430fe
Integrating up through commit 90f050496
5 years ago
39f53338bf
Merge branch 'main' into LoadPipelineFromGitHub
5 years ago
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
e8bbb5a0d5
Set scripts to be executable
...
This is required to build on linux/mac
5 years ago
75dc720198
Integrating latest 47acbe8
5 years ago
a10351f38d
Initial commit
5 years ago
jjjoness
karlberg
hasareej
sphrose
amzn-sean
hultonha
greerdv
mcgarrah
srikappa
kberg-amzn
pereslav
srikappa-amzn
Terry Michaels
Nicholas Van Sickle
jackalbe
SJ
mcgarrah
SergeyAMZN
Chris Galvan
Esteban Papp
Mike Balfour
alexpete
mbalfour
Alex Peterson
jackalbe
Nicholas Van Sickle
Brian Herrera