865ed60007
merging latest dev
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-10-01 09:53:16 -07:00
02bc89cd92
Fixes to sending entity updates and entity rpcs within an environment set up for cross host entity migration
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-28 19:25:04 -07:00
0a829f9661
Merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-27 15:50:22 -07:00
95d7cc7212
Adding the NetworkConnectionComponent to hold user nonce and migration values for a backup host in case the current host crashes or abnormally disconnects
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-27 12:14:41 -07:00
5114c2e0f2
Move AutoComponent jinjas to Include and update cmake accordingly
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-09-24 09:49:46 -07:00
cb75607106
Merged dev
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-09-22 08:09:53 -04:00
35517c4e6a
Merge pull request #4023 from aws-lumberyard-dev/MPSpawnableRework
...
Reworked net entities instantiation in order to fix entity references…
2021-09-22 10:50:35 +01:00
f85a7dfeeb
Merged dev
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-09-21 12:57:57 -04:00
22ab484986
merging latest development
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-20 14:07:49 -07:00
6e84495975
Changes to make client and entity migration functional, needed in the event of a host quitting necessitating a host migration
...
Signed-off-by: kberg-amzn <karlberg@amazon.com >
2021-09-17 16:48:16 -07:00
3973e1d3e5
Moved NetworkCharacterComponent out of MPSample and into MP gem
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-09-14 09:14:55 -07:00
28ca59ae61
Moving NetworkHitVolumesComponent and NetworkRigidBodyComponent to the MultiplayerGem
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-09-13 15:00:42 -07:00
aa6c038880
Hierarchical components, phase 1, unittests
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-09-13 16:51:50 -04:00
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
93a3d3efa0
Bandwith overlay works without imgui
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-08-02 15:57:29 -04:00
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
2021-07-16 15:42:37 -07:00
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
9b0316132c
Gems/Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 16:55:00 -07:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
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
d7bfd34a67
IFilterEntityManager work
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com >
2021-06-30 19:18:06 -04:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
36cb0f6d40
SPEC-7178 Removal of precompiled cpp files ( #1171 )
...
* SPEC-7178 Removal of precompiled cpp files
* Missing files...
2021-06-07 15:59:58 -07:00
090234f1f0
Merge branch 'main' into MultiplayerPipeline
2021-05-28 16:00:09 +01:00
42b3e3817a
SPEC-7012 Added rewind-aware scene query utilities. Added frame ID to SimulatedBody
2021-05-28 15:50:02 +01:00
d2797c0d15
Add RewindableArray and cleanup a bit more of vector
2021-05-25 16:40:58 -07:00
7129cad1ce
Add RewindableFixedVector and update jinja components to use it
2021-05-25 14:12:47 -07:00
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
85374ea7fc
Merged from main
2021-05-18 13:10:44 +01:00
970c87b487
Refactored spawning network entities to use SpawnableEntityManager instead of duplicating the code in NetworkEntityManager
2021-05-17 23:34:58 +01:00
cb55eaf853
Merge main to mp_editor_pipeline
2021-05-16 11:36:47 -07:00
fb51829360
Resolve MP Gem Ctrl+G changes with main
2021-05-15 13:12:16 -07:00
1915b97c16
Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side
2021-05-15 12:58:30 -07:00
61c24ee265
Removing tab in cmake file
2021-05-14 15:22:57 -07:00
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
8a39f9f1b4
Streamline MP Ctrl+G logic via MultiplayerEditorConnection
2021-05-13 15:31:37 -07:00
cb8016bde5
Fix for validator failing on empty files
2021-05-12 20:52:02 -07:00
eea0660d21
A couple more fixes
2021-05-12 20:26:08 -07:00
254ad165c1
A bunch of work to get external multiplayer components to actually work
2021-05-12 16:01:59 -07:00
e7f0bc9ee2
Local prediction player controller is now functional
2021-05-06 17:23:03 -07:00
a1fe8fe419
Ported the local prediction player controller component
2021-05-05 20:07:16 -07:00
2fc710d73b
Addressing PR feedback
2021-04-27 16:03:39 -07:00
c8bc5b7463
Initial work on multiple gem multiplayer components
2021-04-22 14:35:24 -07:00
f26d7f9301
First crack at the multiplayer component registry to allow multiplayer components to live in any gem
2021-04-21 12:47:48 -07:00
0ce18593d2
Merging latest main
2021-04-15 17:40:21 -07:00
a5fdbddeda
Merged MultiplayerPipeline from CodeCommit
2021-04-15 20:24:50 +01:00
ca3df5d6c8
Various bug fixes to get entity replication working
2021-04-13 20:24:08 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
kberg-amzn
puvvadar
AMZN-Olex
SergeyAMZN
Gene Walters
pereslav
Esteban Papp
Steve Pham
Chris Galvan
AMZN-puvvadar
alexpete