07a1af99ba
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
4 years ago
23a4835e48
Desync debug work
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
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
4 years ago
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>
4 years ago
90763faeae
Remove redundant scope from autocomponent functions ( #2134 )
...
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
074518454c
Merge branch 'development' into cmake/SPEC-7179
4 years ago
7950c2b549
Add target host frame ID tracking to network transform
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
9b0316132c
Gems/Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
63cbb69797
Update previous transform to prevent jitter from lerping
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
a48a0d1f8a
Fix positional desync of network objects plus related log spam
...
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
d8c4e0160a
Merge pull request #1970 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
...
Fixed crash when non-net entities get activated
5 years ago
ffb4a3c432
Fixed crash when non-net entities get activated
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
68d2536b3b
Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons
5 years ago
bd5226aac5
Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore
...
Signed-off-by: kberg-amzn <karlberg@amazon.com>
5 years ago
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
0a957fb03a
Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
...
LYN-4866 Fixed net entities indices when creating net spawnable
5 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
d17390befb
LYN-4866 Fixed net entities indices when creating net spawnable
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
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>
5 years ago
d7bfd34a67
IFilterEntityManager work
...
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
5 years ago
1100e20e26
Merged ctrl+g fixes from MultiplayerEditorFixes
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
5 years ago
d6629eea2e
Fix order of ops issue in MP Session Termination
5 years ago
be56cf648d
sig/network - bugfix - removal of player prefabs on disconnect
...
sig/network - bugfix - removal of player prefabs on disconnect
5 years ago
ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
...
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago
6b1d3d1f9a
SPEC-7469 Multiplayer Editor Ctrl+G fails due to EditorInfo packets reordering. SPEC-7471 Multiplayer Editor Ctrl+G asserts after CreateEntitiesImmediate
5 years ago
5a061e409d
Fixed EntityDelete messages
5 years ago
632d774d4c
Add disconnect type param to Terminate
5 years ago
bda758a9c5
Adjust cleanup logic to handle Session events more cohesively
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
93a34033a9
Correcting tabs
5 years ago
b9dec79743
Clean up
5 years ago
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago
e5aa56d565
Added a runtime switch to turn on/off removal of player spawnable on disconnect
5 years ago
35364c9403
Fixing a nullptr crash in NetworkTime
5 years ago
9aa44a56e7
Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
...
Integration from stabilization/2106 at commit d5490ecf69
5 years ago
fd021f065a
Fixes to codegen to avoid nullptr access during disconnects
5 years ago
fcbec8c202
Fixed removal of player's prefab on disconnect
5 years ago
df648db62e
Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
...
# Conflicts:
# Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
# Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
5 years ago
0186911a3a
Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
...
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
5 years ago
55f5e9f0ae
Remove unnecessary forward declare
5 years ago
f2bc80d103
Remove obvious comment
5 years ago
f49e5cf645
Validate some base cases in InitializeMultiplayer
5 years ago
3a7df983d9
Cleanup listen and connect logic to prevent log spam
5 years ago
8f5681ffdb
Add GetActiveConnectionCount to IConnectionSet
5 years ago
530573abf3
Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
...
Updating IsNetEntityRole Helper Methods for Clarity
5 years ago
526a0f1289
Fix for Jenkins Validation: removing tabs and removing unwanted spaces.
5 years ago
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
5 years ago
04387be083
Remove some redundant includes, forward declares and similar pieces
5 years ago
a748c2e152
Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking
5 years ago
b9dd7a1ecd
Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code
5 years ago
4be9ce56c4
Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
...
Cherry pick networking fixes
5 years ago
0810f353c6
Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty
5 years ago
be71aec4e3
Merge branch 'development' of https://github.com/aws-lumberyard/o3de into mp_systemcomp_cleanup
5 years ago
2b8e87f674
Begin cleaning MPSysComponent
5 years ago
bcd008df20
Allowing network properties to generate event bindings while staying hidden from script by using a new ExposeToScript attribute. This was useful in hiding NetworkTransformComponent properties which needed event binding in order to update the normal transform, but remain hidden from scripters who should still be using the normal transform component
5 years ago
2a6009c94b
Cleanup OnDisconnect client case slightly
5 years ago
cf5641a211
Cleanup shutdown, activate and deactivate for MPSystemComponent
5 years ago
2eca923694
Rework session validation to work through Connect packet
5 years ago
adc09435f4
Cleanup validation failure logic
5 years ago
04bf6c3689
Separate out session validation into its own packet
5 years ago
548f65e5d8
Merge pull request #1206 from aws-lumberyard-dev/SPEC7223_MultiplayerComponentRPC_BehaviorContext_ParameterNames
...
Multiplayer RPC Parameter Names Exposed to Behavior Context
5 years ago
5bdf9e3c6d
Merge pull request #1175 from aws-lumberyard-dev/mp_session_integ
...
Integrating AzFramework Session hooks to Multiplayer
5 years ago
618b7d12bb
Add parameter names to RPC behavior context so users know what each parameter does. Also added tooltip, although script canvas isnt always showing it (I will create a separate bug)
5 years ago
59d0a8817e
Fix inconsistent naming and cover edge case
5 years ago
da7870bb2a
Fix some typos and comments
5 years ago
056e170eb6
Check for dns name on request player join
5 years ago
cd5867d2fa
Cleanup session changes and add on connection disconnected event
5 years ago
fa55b495c4
Add handling for session provider ticket
5 years ago
260b2851f3
Merge pull request #1148 from aws-lumberyard-dev/SPEC7174_ReceiveRPCsViaScriptViaEntityId
...
Allow Script Canvas Users to Listen for RPC Events Via EntityId
5 years ago
2b227a17d1
Remove extraneous code
5 years ago
45b1bbc85c
Fix duplicate include
5 years ago
6f4c0c2ce8
Rename interfaces for clarity
5 years ago
03989f77bb
Cleanup includes
5 years ago
40c7a6bd2d
Integrate remaining requests and rename Handling Requests interfaces for clarity
5 years ago
36cb0f6d40
SPEC-7178 Removal of precompiled cpp files ( #1171 )
...
* SPEC-7178 Removal of precompiled cpp files
* Missing files...
5 years ago
5274019d31
Merge branch 'main' into mp_session_integ
5 years ago
3e74c4f1e1
fixed minor type. Beh method name should say entityId, not entity
5 years ago
4eb5b3554e
Merge branch 'main' into SpawnableEntityIdMapping
5 years ago
6ed6f3f808
Merge branch 'main' into mp_session_integ
5 years ago
c586ff1ca6
Allow script canvas user to listen for RPC events
5 years ago
76a6df341b
SPEC-2513 Fixes to enable w4457
5 years ago
1d6c69dea2
Merge main to mp_session_integ
5 years ago
c55f65b78f
Integrate parts of Session Server API
5 years ago
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.
5 years ago
8666ca6467
Merge pull request #1119 from aws-lumberyard-dev/SPEC7150_AllowScriptCanvasUsersToSendRPC
...
SPEC-7150 Allow Script Canvas Users to Send RemoteProcedures via EntityId
5 years ago
e340f3ca56
Merge pull request #1102 from aws-lumberyard-dev/MultiplayerPipeline
...
Fixed ctrl+g port number
5 years ago
cd619e14dc
Allow script canvas users to send RPCs via entityId
5 years ago
89b1afc50e
Adding Multiplayer:: namespace to RpcIndex so components outside the Multiplayer gem can compile
5 years ago
afeea87862
Fix for linux being a banned keyword
5 years ago
bffb7d1b28
Simplified the change to rely on sv_port cvar
5 years ago
3b519c6475
removed whitespace
5 years ago
c752b9d0fc
Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts
5 years ago
38853eb2c2
Linux build fix
5 years ago
82f9d08cfd
Build fix for uniform scale changes
5 years ago
14bc0ba8ac
Merge remote-tracking branch 'origin' into MultiplayerComponents
5 years ago
b013d7ac67
Minor cleanup
5 years ago
kberg-amzn
Esteban Papp
Steve Pham
Gene Walters
puvvadar
SergeyAMZN
pereslav
hultonha
Chris Galvan
AMZN-Olex
Gene Walters
Mike Balfour
mbalfour
AMZN-puvvadar
nvsickle
AMZN-koppersr