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
90763faeae
Remove redundant scope from autocomponent functions ( #2134 )
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-07-16 11:05:20 -07:00
074518454c
Merge branch 'development' into cmake/SPEC-7179
2021-07-15 16:58:58 -07:00
9b0316132c
Gems/Multiplayer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 16:55:00 -07:00
a48a0d1f8a
Fix positional desync of network objects plus related log spam
...
Signed-off-by: puvvadar <puvvadar@amazon.com >
2021-07-12 11:15:38 -07:00
d8c4e0160a
Merge pull request #1970 from aws-lumberyard-dev/MultiplayerRigidBodiesLerp
...
Fixed crash when non-net entities get activated
2021-07-08 20:56:36 +01:00
ffb4a3c432
Fixed crash when non-net entities get activated
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-08 17:07:51 +01:00
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-07 16:25:06 +01:00
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-07 00:12:30 +01:00
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01: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
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
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
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
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
1100e20e26
Merged ctrl+g fixes from MultiplayerEditorFixes
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-06-30 13:20:07 +01:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
d6629eea2e
Fix order of ops issue in MP Session Termination
2021-06-24 13:56:16 -07:00
be56cf648d
sig/network - bugfix - removal of player prefabs on disconnect
...
sig/network - bugfix - removal of player prefabs on disconnect
2021-06-24 15:01:41 -05:00
ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
...
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-24 16:56:52 +01:00
6b1d3d1f9a
SPEC-7469 Multiplayer Editor Ctrl+G fails due to EditorInfo packets reordering. SPEC-7471 Multiplayer Editor Ctrl+G asserts after CreateEntitiesImmediate
2021-06-24 01:12:19 +01:00
5a061e409d
Fixed EntityDelete messages
2021-06-23 18:00:13 -04:00
632d774d4c
Add disconnect type param to Terminate
2021-06-23 11:44:21 -07:00
bda758a9c5
Adjust cleanup logic to handle Session events more cohesively
2021-06-23 10:56:22 -07:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
93a34033a9
Correcting tabs
2021-06-23 13:21:54 -04:00
b9dec79743
Clean up
2021-06-23 11:04:25 -04:00
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-23 15:29:31 +01:00
e5aa56d565
Added a runtime switch to turn on/off removal of player spawnable on disconnect
2021-06-23 09:38:43 -04:00
35364c9403
Fixing a nullptr crash in NetworkTime
2021-06-22 23:13:23 -04:00
9aa44a56e7
Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
...
Integration from stabilization/2106 at commit d5490ecf69
2021-06-22 15:14:22 -05:00
fd021f065a
Fixes to codegen to avoid nullptr access during disconnects
2021-06-22 14:56:10 -04:00
fcbec8c202
Fixed removal of player's prefab on disconnect
2021-06-22 14:55:45 -04:00
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
2021-06-22 12:55:18 -05:00
0186911a3a
Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
...
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
55f5e9f0ae
Remove unnecessary forward declare
2021-06-22 09:25:29 -07:00
f2bc80d103
Remove obvious comment
2021-06-21 14:53:19 -07:00
f49e5cf645
Validate some base cases in InitializeMultiplayer
2021-06-21 14:49:49 -07:00
3a7df983d9
Cleanup listen and connect logic to prevent log spam
2021-06-21 14:31:14 -07:00
8f5681ffdb
Add GetActiveConnectionCount to IConnectionSet
2021-06-21 11:46:16 -07:00
530573abf3
Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
...
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
526a0f1289
Fix for Jenkins Validation: removing tabs and removing unwanted spaces.
2021-06-20 20:51:59 -07:00
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
2021-06-18 13:25:53 -07:00
04387be083
Remove some redundant includes, forward declares and similar pieces
2021-06-17 16:25:44 -07:00
a748c2e152
Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking
2021-06-17 16:17:36 -07:00
b9dd7a1ecd
Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code
2021-06-17 16:16:38 -07:00
4be9ce56c4
Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
...
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
0810f353c6
Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty
2021-06-17 09:11:48 -07:00
Esteban Papp
Steve Pham
Gene Walters
puvvadar
SergeyAMZN
pereslav
hultonha
Chris Galvan
AMZN-Olex
Gene Walters
Mike Balfour
mbalfour
AMZN-puvvadar
nvsickle