Chris Galvan
20ee399864
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
5 years ago
Chris Burel
d8bd6ef407
Preserve asset ids for assets that fail to load, when deserializing from json ( #847 )
...
Sometimes deserializing a Json document happens when asset handlers are not
registered. In that case, `FindOrCreateAsset` will fail to create the
asset, since there's no handler registered to create it. When this happens,
`FindOrCreateAsset` returns an Asset instance with a null asset id. This
effectively causes the json deserializer to lose that data, even in
situations where the the actual asset data doesn't need to be loaded, but
the asset id needs to be preserved.
5 years ago
greerdv
1a4bdcf651
Merge pull request #855 from aws-lumberyard-dev/non-uniform-scale-blast
...
remove vector scale from Blast in preparation for its removal from Transform
5 years ago
Tom Hulton-Harrop
74a2735766
Add better support for mouse deltas with camera system ( #846 )
...
* add better support for mouse deltas with camera system
* small fixes spotted during review
* rename after review feedback
* small refactor to reduce duplication
5 years ago
kberg-amzn
c05c100a72
Merge pull request #834 from aws-lumberyard-dev/MultiplayerComponents
...
Finishing off rewind and backward reconciliation support as well as a bunch of bug fixes and API cleanup.
5 years ago
lumberyard-employee-dm
8028cbbe39
Fixed issue where the SettingsRegistryImpl::LessThan function would set the collisionFound boolean to true when comparing two elements that happened to be at the same address via std::sort. ( #857 )
...
In reality there is no such collision and the comparisons needs to early return with false, but not change the collisionFound flag.
5 years ago
karlberg
3dd40171cd
Merging latest origin
5 years ago
AMZN-puvvadar
fd3927651b
Merge pull request #840 from aws-lumberyard-dev/mpgem_scripting_rpc
...
Add events for MP Gem RPCs plus BC reflection so ScriptCanvas can respond to them
5 years ago
chiyenteng
01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag ( #769 )
...
* Move the basic Prefab workflows out from behind the WIP flag
5 years ago
greerdv
726597ad34
Merge branch 'main' into non-uniform-scale-blast
5 years ago
greerdv
87b1a19df4
remove vector scale from Blast in preparation for removal from Transform
5 years ago
puvvadar
ba6f9867f6
Reorder TCP Select early exit
5 years ago
Chris Galvan
1a15007dcb
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
5 years ago
Chris Galvan
c105894aa5
[LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered).
5 years ago
puvvadar
80e12a2df3
Fix whitespace delta
5 years ago
puvvadar
d26d24d9bd
Remove test RTTIs
5 years ago
puvvadar
7ecb00cca1
Cleanup jinja formatting and fix log spam
5 years ago
Danilo Aimini
c93c457356
Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
...
LYN-3833 | Position of entity is different after creating it into a prefab
5 years ago
Chris Galvan
8d8504aec3
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
5 years ago
Chris Galvan
2d89c60175
[LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback.
5 years ago
Tom Hulton-Harrop
eb31d90ad9
Updates to fix BoxSelect when using Orbit with the new Camera ( #825 )
...
* update camera controller to block box select during orbit
* simplify update for modern viewport camera controller
* wip working lmb box select with orbit
* add test for changes to click detector
* add unit test for camera system to validate events
* remove debugging code, tidy-up changes for PR
* small updates before posting PR
* fix for linux build failure
5 years ago
puvvadar
2452149e7d
Add RPC Events plus reflection plus fix Ctrl+G retry
5 years ago
daimini
2112d67b6b
Rename variable to make it clearer it's a map
5 years ago
lumberyard-employee-dm
73335c7160
Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms ( #821 )
...
* Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms
* Adding back missing path variable
* Fix typo in homePath variable
5 years ago
daimini
e638c6b0d5
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
5 years ago
karlberg
6a643392f0
Merging latest main
5 years ago
karlberg
487e989e68
Several updates to complete rewind support and remove unneeded functionality
5 years ago
sconel
6a108c0515
Merge pull request #806 from aws-lumberyard-dev/Spawnable/Instantiation/EntityIdReferenceFix
...
Updating SpawnAllEntities to handle entity references during spawn
5 years ago
Vincent Liu
ad2d2381a4
[SPEC-6713] Add common session interfaces and notifications ( #773 )
5 years ago
sconel
31e5a312b4
Updated loadAll check to set to false if previous entities already spawned on ticket
5 years ago
sconel
4769664e9e
Updating the loadAll flag after a SpawnAllCommand
5 years ago
amzn-sean
8dbcd9f199
increase physics max frame time to 0.1 seconds (10fps) ( #824 )
5 years ago
sconel
a4f673eb32
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
5 years ago
sconel
d8126d59c7
Moved to iterative clone instead of bulk, addressed PR feedback
5 years ago
sphrose
815e750439
Merge pull request #94 from aws-lumberyard-dev/LY-113714
...
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
5 years ago
daimini
977030a27a
On prefab creation, inherit the patches when moving the nested prefab instances and then update the link with the new parent if necessary.
5 years ago
sconel
8733f0e492
Remove extra newline
5 years ago
sconel
66a7db44f7
Reduced scope of change to focus on SpawnAllEntities
5 years ago
sconel
b2ab26b428
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
5 years ago
AMZN-puvvadar
29b4ab6ff3
Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline
...
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
5 years ago
sconel
fb290a27af
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
5 years ago
daimini
a4953a5204
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
...
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
5 years ago
puvvadar
55ecd8517d
Add assert to new Asset constructor to declare intent and safeguard ID overwrite
5 years ago
daimini
bb458254a2
Polish pass - rename arguments to be more generic, add comments, restore patches to links during instantiation that were mistakenly removed in previous changes.
5 years ago
srikappa-amzn
3c40aad148
Merge pull request #792 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Bug fixes for creating prefabs with nested entities
5 years ago
SergeyAMZN
6626a7cf8e
Merge pull request #682 from aws-lumberyard-dev/MultiplayerPipeline
...
Added support for parent-child networked entities
5 years ago
Chris Galvan
0959756f73
[LYN-2255] Implemented duplication of entities with prefabs.
5 years ago
sconel
4dccfa0d74
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
5 years ago
Tommy Walton
d0810892f1
ATOM-15358 : Culling concurrency checker fails in AtomSampleViewer (merge from 1.0->main)
...
Inserting, updating, and removing entries from a VisibilityScene was made thread safe in a previous change, and now both the MeshFeatureProcessor and DiffuseProbeGridFeatureProcessor update entries at the same time from multiple threads. This leads to an assert in the Culling concurrency_checker, even though this is now valid behavior.
However, we still don't want to be adding, removing, or updating cullables between BeginCulling and EndCulling, which could cause a mismatch between the result of OctreeScene::GetEntryCount and the actual number of cullables in the scene.
-Added soft_lock_shared/soft_unlock_shared to the concurrency checker to allow multiple threads to acquire a lock when that is the desired behavior, while still asserting that nothing tries to acquire a shared lock when the concurrency checker is already locked.
-Update Culling.cpp to use the new soft_lock_shared when adding, updating, or removing cullables
-Added unit tests for the concurrency_checker
-Updated ArrayView unit test to use AZ_TEST_START_TRACE_SUPPRESSION instead of manually checking the assertion count, so that test now passes in release builds which do not assert.
5 years ago
bosnichd
7a557c05ac
Remove or update some remaining non-inclusive terms. ( #793 )
5 years ago