Commit Graph

285 Commits (f85e8124a9ee10e2e337877d2f67e9033fa8eff4)

Author SHA1 Message Date
kberg-amzn f85e8124a9 Fixes and cleanup for recent correction changes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 976654e809 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn e0d0bbfdae Changes to desync debug output to make it less stressful on bandwidth and the server, as well as some fixes to corrections on the local client
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
puvvadar e22820e08b
Merge pull request #2146 from aws-lumberyard-dev/mp_lerp_jitter
Fix inconsistent client lerp and account for blend factor on server
4 years ago
lumberyard-employee-dm bb372f05cd
Fixed the emplace function implementations for stack and queue (#2657)
* Fixed the emplace function implementations for stack and queue

Cleaned up several functions in the stack, queue and priority_queue
classes that were non-standard or weren't needed.

Updated the "style" of the code to use more modern concepts: "typedef" ->
"using", empty constructor body -> default keyword.

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

* Replaced the custom implementations of AZStd stack, (proirity)queue

Theses classes now have a template alias to the standard library version
of the classes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
puvvadar 318fee8e22 Fix tabs
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar 8612d7bce2 Fix incorrect blending math
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
SergeyAMZN 42a99d3d43
Merge pull request #2618 from aws-lumberyard-dev/MPAsteroids
Fixed autogen namespace always going upper case
4 years ago
pereslav ce99e3f2ec Fixed autogen namespace always going upper case
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
puvvadar 496a0f686f Merge branch 'development' of https://github.com/o3de/o3de into mp_lerp_jitter 4 years ago
AMZN-Olex c13d3ec086 Minor corrections in code gen for usability
Signed-off-by: Olex Lozitskiy <mr.olexander@gmail.com>
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
4 years ago
kberg-amzn 6839497d99 Corrects math computing blend factors to interpolate state between received network updates
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
puvvadar 3429738f38 Merge branch 'development' of https://github.com/o3de/o3de into mp_lerp_jitter 4 years ago
kberg-amzn 23fb27e2a4 New AzNetworking metrics display plus connection quality debug widgets using ImGui
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
puvvadar b4e8801095 Account for new blend factor calc and updated ScopedAlterTime usages
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
onecent1101 85c403ea06 Remove =
Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
onecent1101 d7627c05f6 Fix autogen template RewindableObject construction for linux platform
Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
puvvadar 08a53a3a6f Merging development to mp_lerp_jitter
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar b55bad496d Adding rewindable mechanisms to support interpolation
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
kberg-amzn 52780f2130 Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons 5 years ago
puvvadar ebe326f6e9 Add server side accounting for blend factor
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
Gene Walters d411c1d1d9
Autonomous to Authority Net Properties (#2153)
* WIP. Autonomous->Authority network properties now functional. Still need some research in regards to entity ownership when it comes to the PropertyPublisher.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* WIP. Exposing Auton->Auth Properties accessors and onchange events

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Fix propertypublisher constructor to skip the creation state if we arent the owner. Removing ClientToServerReplicationWindow, return to just using NullReplicationWindow.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Reverting some wip debug prints

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Minor whitespacing fix

Signed-off-by: Gene Walters <genewalt@amazon.com>

* minor undoing of whitespacing

Signed-off-by: Gene Walters <genewalt@amazon.com>

* NullReplicationWindow MaxReplication is 0, but now Autonomous entity updates will always be added to the send list (ignoring the max replication limit)

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Updating PropertyPublisher comment to explicitly call out if we dont own the entity locally, the remote replicator must exist

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Renaming RepiclationWindow GetMaxEntityReplicatorSendCount to GetMaxProxyEntityReplicatorSendCount; this number only affects the number of proxy sends and allows autonomous properties to always send

Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
kberg-amzn 07a1af99ba Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons 5 years ago
kberg-amzn 23a4835e48 Desync debug work
Signed-off-by: kberg-amzn <karlberg@amazon.com>
5 years ago
Esteban Papp 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
5 years ago
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>
5 years ago
Gene Walters 90763faeae
Remove redundant scope from autocomponent functions (#2134)
Signed-off-by: Gene Walters <genewalt@amazon.com>
5 years ago
Esteban Papp 074518454c Merge branch 'development' into cmake/SPEC-7179 5 years ago
puvvadar 7950c2b549 Add target host frame ID tracking to network transform
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
Esteban Papp 9b0316132c Gems/Multiplayer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
puvvadar 63cbb69797 Update previous transform to prevent jitter from lerping
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
puvvadar a48a0d1f8a Fix positional desync of network objects plus related log spam
Signed-off-by: puvvadar <puvvadar@amazon.com>
5 years ago
SergeyAMZN d8c4e0160a
Merge pull request #1970 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
Fixed crash when non-net entities get activated
5 years ago
pereslav ffb4a3c432 Fixed crash when non-net entities get activated
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
kberg-amzn 68d2536b3b Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons 5 years ago
kberg-amzn 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
hultonha 9bfb90a513 Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
pereslav 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
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
SergeyAMZN 0a957fb03a
Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
LYN-4866 Fixed net entities indices when creating net spawnable
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
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>
5 years ago
AMZN-Olex d7bfd34a67 IFilterEntityManager work
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
5 years ago
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 5 years ago
puvvadar d6629eea2e Fix order of ops issue in MP Session Termination 5 years ago
Olex Lozitskiy be56cf648d
sig/network - bugfix - removal of player prefabs on disconnect
sig/network - bugfix - removal of player prefabs on disconnect
5 years ago
SergeyAMZN ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago