Commit Graph

46 Commits

Author SHA1 Message Date
Sergey Pereslavtsev 9109b9de8d Removed includes
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 15:19:11 +01:00
Sergey Pereslavtsev 43e6731714 Removed hierarchy validation since it is not always applicable
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 15:17:11 +01:00
Sergey Pereslavtsev 348bb7d37e Added setreg option for network spawnables serialization format
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-28 13:49:08 +01:00
Sergey Pereslavtsev dc336ffaba Added validation to net prefab processing to error if there are hierarchical entities without Net hierarchy components
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2021-10-26 16:10:35 +01:00
pereslav b1a76feead Added tests. Made network spawnable to serialize in binary
Signed-off-by: pereslav <pereslav@amazon.com>
2021-10-14 23:21:04 +01:00
kberg-amzn 865ed60007 merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-10-01 09:53:16 -07:00
Artur K f44169f7fa Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-29 11:31:01 -05:00
kberg-amzn 0a829f9661 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 15:50:22 -07:00
pereslav bf1ebea202 Moved local variable to a smaller scope
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 17:12:58 +01:00
pereslav 44c8ae2872 Changed NetworkSpawnableHolderComponent to use Entity::GetTransform instead of an ebus call
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-24 13:03:02 +01:00
pereslav ae2525564d Updated NetworkSpawnableHolderComponent to use TransformBus instead of FindComponent. Added dependency on TransformService
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-22 13:29:55 +01:00
pereslav 895974db57 Removed spawn/despawn events from the spawnable system. Used NetworkSpawnableHolderComponent instead
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-21 14:50:06 +01:00
pereslav a0ada8fcd3 Reworked net entities instantiation in order to fix entity references e.g. parent-child relationship. Note: Only entities within network spawnable keep the references until the ticket system refactoring is done
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-09 16:44:35 +01:00
sconel fbcb6510e6 Update storage of Prefab Dom info to be best effort (#2862)
* Update storage of Prefab Dom info to be best effort

Signed-off-by: sconel <sconel@amazon.com>

* Update IssueReporter to Skipped instead of PartialSkip

Signed-off-by: sconel <sconel@amazon.com>

* Address PR feedback

Signed-off-by: sconel <sconel@amazon.com>

* Fix failing Prefab Unit Test that expected default values to be stripped

Signed-off-by: sconel <sconel@amazon.com>
2021-08-11 10:45:31 -07:00
pappeste 0f0a6c5cd3 Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 19:30:49 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
SergeyAMZN 0a957fb03a Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
LYN-4866 Fixed net entities indices when creating net spawnable
2021-07-02 21:31:42 +01:00
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-02 16:01:30 +01:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Gene Walters 0810f353c6 Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty 2021-06-17 09:11:48 -07:00
AMZN-koppersr 1e7ac60949 Reintroduced spawning multiple instances of the same entity
The following was changed:
- The remapper in AZ::IdUtils now has an additional argument to tell it what to do when it encounters the same source entity id. The original behavior of ignoring the new entity id and returning the first occurrence is the default. The alternative behavior is to store the last known entity id and return that instead.
- Split the optional arguments for SpawnAllEntities and SpawnEntities.
- SpawnEntities now has an option to continue with the entity mapping from a previous spawn call or to start with a fresh mapping. The latter is the default as the former will come at a performance cost since the mapping table has to be reconstructed.
- Entities spawned using SpawnEntities and ReloadEntities now also get the correct entity mapping applied.
- Added several new unit tests to cover most of the new functionality.
- Fixed some places where the older API version was still called.
2021-06-03 10:56:34 -07:00
AMZN-koppersr d4ce2849c7 Post-merge fixup. 2021-05-27 16:46:33 -07:00
pereslav cb87b7cd1f Moved early return case in prefab processing 2021-05-20 19:43:33 +01:00
pereslav 43d98ac989 Fixed comment 2021-05-20 16:56:54 +01:00
pereslav 22e893ccbe Added support for nested prefabs in multiplayer pipeline 2021-05-20 16:32:41 +01: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
pereslav f721aa511f Fixed entity IDs of the original & networked spawnables 2021-05-18 17:15:24 +01:00
pereslav 85374ea7fc Merged from main 2021-05-18 13:10:44 +01:00
puvvadar 93e267345f Address string/mem feedback plus some misc cleanup 2021-05-17 18:46:21 -07:00
pereslav 970c87b487 Refactored spawning network entities to use SpawnableEntityManager instead of duplicating the code in NetworkEntityManager 2021-05-17 23:34:58 +01:00
puvvadar cb55eaf853 Merge main to mp_editor_pipeline 2021-05-16 11:36:47 -07:00
puvvadar fb51829360 Resolve MP Gem Ctrl+G changes with main 2021-05-15 13:12:16 -07:00
puvvadar 1915b97c16 Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side 2021-05-15 12:58:30 -07:00
karlberg 5acdc40595 Many fixes for external gem multiplayer components and component network inputs, fixes an uninitialized variable resulting in continual desyncs, restructures our public includes to match the directory structure of source, allows autogen artefacts to be included by external gems, allowing for external multiplayer components to interact with multiplayer gem components with no extra code 2021-05-14 14:24:33 -07:00
pereslav a852da93a3 Merge branch 'main' into MultiplayerPipeline 2021-05-13 23:40:43 +01:00
puvvadar 8a39f9f1b4 Streamline MP Ctrl+G logic via MultiplayerEditorConnection 2021-05-13 15:31:37 -07:00
karlberg e772265871 Build fixes for gem reorganization 2021-05-12 20:09:27 -07:00
pereslav 92ef82f933 Added handling parented net entities 2021-05-10 19:52:23 +01:00
puvvadar 108f4dfdd6 Merge branch 'main' into mp_editor_pipeline 2021-05-06 16:19:15 -07:00
pereslav e414cc151d SPEC-6590 Implemented network entities instantiation by network spawnable asset ID 2021-05-05 00:00:06 +01:00
puvvadar 2f4120cdfb Update Ctrl+G logic to account for prefab processing status and timing 2021-05-03 13:07:11 -07:00
pereslav 7e633d907e Enabled NetworkPrefabProcessor for Ctrl+G 2021-04-29 16:26:13 +01:00
karlberg 4e75a099b8 Initial Imgui debug display for stats, some hookup between entity replication and the spawnable code to make testing possible 2021-04-17 19:06:28 -07:00
pereslav 4962218d29 Refactored root spawnable instantiation, added selective instantiation of root spawnable entities 2021-04-16 00:19:43 +01:00
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 2021-04-15 20:24:50 +01:00