igarri
6ca37bbf84
Checking variable constness
2021-05-27 14:04:02 +01:00
igarri
6a0cf97456
Fixed Selection in AssetBrowserTreeView
2021-05-24 13:19:35 +01:00
igarri
5434754def
Merge branch 'main' into LYN-1767-AB
2021-05-21 14:54:42 +01:00
igarri
dfb0d7f9f5
Fixed numeric_cast, style, const variables
2021-05-21 12:33:55 +01:00
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
2021-05-21 12:07:55 +01:00
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
2021-05-21 10:35:33 +01:00
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.
2021-05-20 18:48:40 -07:00
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.
2021-05-20 20:41:30 -05:00
karlberg
3dd40171cd
Merging latest origin
2021-05-20 17:08:18 -07:00
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
2021-05-20 15:58:29 -07:00
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
2021-05-20 14:44:27 -07:00
greerdv
726597ad34
Merge branch 'main' into non-uniform-scale-blast
2021-05-20 22:05:22 +01:00
greerdv
87b1a19df4
remove vector scale from Blast in preparation for removal from Transform
2021-05-20 22:04:37 +01:00
puvvadar
ba6f9867f6
Reorder TCP Select early exit
2021-05-20 12:48:49 -07:00
puvvadar
80e12a2df3
Fix whitespace delta
2021-05-20 11:39:25 -07:00
puvvadar
d26d24d9bd
Remove test RTTIs
2021-05-20 11:38:06 -07:00
puvvadar
7ecb00cca1
Cleanup jinja formatting and fix log spam
2021-05-20 10:46:48 -07:00
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
2021-05-20 10:32:42 -07:00
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
2021-05-20 15:54:36 +01:00
puvvadar
2452149e7d
Add RPC Events plus reflection plus fix Ctrl+G retry
2021-05-19 19:34:48 -07:00
daimini
2112d67b6b
Rename variable to make it clearer it's a map
2021-05-19 16:15:18 -07:00
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
2021-05-19 18:05:29 -05:00
daimini
e638c6b0d5
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
2021-05-19 15:30:48 -07:00
karlberg
6a643392f0
Merging latest main
2021-05-19 13:37:45 -07:00
karlberg
487e989e68
Several updates to complete rewind support and remove unneeded functionality
2021-05-19 13:27:24 -07:00
sconel
6a108c0515
Merge pull request #806 from aws-lumberyard-dev/Spawnable/Instantiation/EntityIdReferenceFix
...
Updating SpawnAllEntities to handle entity references during spawn
2021-05-19 11:26:10 -07:00
Vincent Liu
ad2d2381a4
[SPEC-6713] Add common session interfaces and notifications ( #773 )
2021-05-19 10:33:48 -07:00
sconel
31e5a312b4
Updated loadAll check to set to false if previous entities already spawned on ticket
2021-05-19 08:58:12 -07:00
sconel
4769664e9e
Updating the loadAll flag after a SpawnAllCommand
2021-05-19 08:50:14 -07:00
amzn-sean
8dbcd9f199
increase physics max frame time to 0.1 seconds (10fps) ( #824 )
2021-05-19 16:44:53 +01:00
sconel
a4f673eb32
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
2021-05-19 08:40:09 -07:00
sconel
d8126d59c7
Moved to iterative clone instead of bulk, addressed PR feedback
2021-05-19 08:39:00 -07:00
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.
2021-05-19 16:05:35 +01:00
igarri
0b50b6cc63
Fixed code Style and minor issues from feedback
2021-05-19 12:04:40 +01:00
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.
2021-05-18 17:53:27 -07:00
sconel
8733f0e492
Remove extra newline
2021-05-18 17:16:44 -07:00
sconel
66a7db44f7
Reduced scope of change to focus on SpawnAllEntities
2021-05-18 17:13:24 -07:00
sconel
b2ab26b428
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
2021-05-18 17:10:06 -07:00
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
2021-05-18 16:28:08 -07:00
sconel
fb290a27af
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
2021-05-18 16:24:23 -07:00
daimini
a4953a5204
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
...
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
2021-05-18 15:04:34 -07:00
puvvadar
55ecd8517d
Add assert to new Asset constructor to declare intent and safeguard ID overwrite
2021-05-18 14:57:27 -07:00
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.
2021-05-18 14:52:30 -07:00
srikappa-amzn
3c40aad148
Merge pull request #792 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Bug fixes for creating prefabs with nested entities
2021-05-18 13:33:34 -07:00
SergeyAMZN
6626a7cf8e
Merge pull request #682 from aws-lumberyard-dev/MultiplayerPipeline
...
Added support for parent-child networked entities
2021-05-18 21:23:32 +01:00
sconel
4dccfa0d74
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Spawnable/Instantiation/EntityIdReferenceFix
2021-05-18 11:54:29 -07:00
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.
2021-05-18 10:53:41 -07:00
bosnichd
7a557c05ac
Remove or update some remaining non-inclusive terms. ( #793 )
2021-05-18 11:43:57 -06:00
srikappa
1a1d608c7a
Merge branch 'main' into Prefab/CreatePrefab
2021-05-18 10:22:33 -07:00
Aaron Ruiz Mora
dd398891c9
Improve iOS string handling in DynamicModuleHandle_iOS
2021-05-18 16:43:51 +01:00