Commit Graph

244 Commits (f47e71da36e29f097509a1c5dd9555ffdbc34bfb)

Author SHA1 Message Date
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@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
pereslav 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
AMZN-Olex 5a061e409d Fixed EntityDelete messages 5 years ago
puvvadar 632d774d4c Add disconnect type param to Terminate 5 years ago
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 5 years ago
Steve Pham 70042fcdcd
O3DE Copyright Updates for Linux Foundation (#1504) 5 years ago
AMZN-Olex 93a34033a9 Correcting tabs 5 years ago
AMZN-Olex b9dec79743 Clean up 5 years ago
pereslav 970dcea16e SPEC-7469 Fixed EditorServerInfo packet serialization 5 years ago
AMZN-Olex e5aa56d565 Added a runtime switch to turn on/off removal of player spawnable on disconnect 5 years ago
AMZN-Olex 35364c9403 Fixing a nullptr crash in NetworkTime 5 years ago
Mike Balfour 9aa44a56e7
Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
5 years ago
AMZN-Olex fd021f065a Fixes to codegen to avoid nullptr access during disconnects 5 years ago
AMZN-Olex fcbec8c202 Fixed removal of player's prefab on disconnect 5 years ago
mbalfour 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
AMZN-puvvadar 0186911a3a
Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
5 years ago
puvvadar 55f5e9f0ae Remove unnecessary forward declare 5 years ago
puvvadar f2bc80d103 Remove obvious comment 5 years ago
puvvadar f49e5cf645 Validate some base cases in InitializeMultiplayer 5 years ago
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 5 years ago
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 5 years ago
Gene Walters 530573abf3
Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
5 years ago
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 5 years ago
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 5 years ago
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 5 years ago
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 5 years ago
Gene Walters b9dd7a1ecd Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code 5 years ago
Gene Walters 4be9ce56c4
Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
Cherry pick networking fixes
5 years ago
Gene Walters 0810f353c6 Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty 5 years ago
puvvadar be71aec4e3 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into mp_systemcomp_cleanup 5 years ago
puvvadar 2b8e87f674 Begin cleaning MPSysComponent 5 years ago
Gene Walters 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
puvvadar 2a6009c94b Cleanup OnDisconnect client case slightly 5 years ago
puvvadar cf5641a211 Cleanup shutdown, activate and deactivate for MPSystemComponent 5 years ago
puvvadar 2eca923694 Rework session validation to work through Connect packet 5 years ago
puvvadar adc09435f4 Cleanup validation failure logic 5 years ago
puvvadar 04bf6c3689 Separate out session validation into its own packet 5 years ago
Gene Walters 548f65e5d8
Merge pull request #1206 from aws-lumberyard-dev/SPEC7223_MultiplayerComponentRPC_BehaviorContext_ParameterNames
Multiplayer RPC Parameter Names Exposed to Behavior Context
5 years ago
AMZN-puvvadar 5bdf9e3c6d
Merge pull request #1175 from aws-lumberyard-dev/mp_session_integ
Integrating AzFramework Session hooks to Multiplayer
5 years ago
Gene Walters 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
puvvadar 59d0a8817e Fix inconsistent naming and cover edge case 5 years ago
puvvadar da7870bb2a Fix some typos and comments 5 years ago