birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,328 Commits 3 Branches 3 Tags
514f9ef6c2b373d5c5c821d641cc87f69ba8715f
Commit Graph

45 Commits

Author SHA1 Message Date
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
SergeyAMZN ba80c102b5 Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes 
SPEC-7469 Fixed EditorServerInfo packet serialization
 2021-06-24 16:56:52 +01:00
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 2021-06-23 10:56:22 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
pereslav 970dcea16e SPEC-7469 Fixed EditorServerInfo packet serialization 2021-06-23 15:29:31 +01:00
Mike Balfour 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
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
 2021-06-22 12:55:18 -05:00
puvvadar 4d0d97b3fe Remove excessive assert 2021-06-21 16:52:05 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 2021-06-21 11:46:16 -07:00
stramer 673495c49d Address additional review comments. 
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
 2021-06-17 18:01:44 -07:00
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 2021-06-17 16:25:44 -07:00
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 2021-06-17 16:17:36 -07:00
stramer c7399537e2 Address review feedback. 
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
 2021-06-17 14:15:56 -07:00
stramer c7a0e7b930 [LYN-4366] Add API documentation for AzNetworking, Mutiplayer Gem, and Multiplayer Compression Gem classes. 
Signed-off-by: stramer <stramer@amazon.com>
 2021-06-16 13:53:42 -07:00
Esteban Papp 68ffdd6714 SPEC-2513 Fixes to enable w4324 (#1197) 
* Fix warning 4324

* warning that doesnt trigger anything

* missed warning
 2021-06-09 11:33:13 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
pereslav e445c64321 Fixed TimedThread bled %d ms logging to not spam the console 2021-06-03 01:21:27 +01:00
karlberg 3dd40171cd Merging latest origin 2021-05-20 17:08:18 -07:00
puvvadar ba6f9867f6 Reorder TCP Select early exit 2021-05-20 12:48:49 -07:00
puvvadar 80e12a2df3 Fix whitespace delta 2021-05-20 11:39:25 -07:00
puvvadar d26d24d9bd Remove test RTTIs 2021-05-20 11:38:06 -07:00
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 2021-05-20 10:46:48 -07:00
puvvadar 2452149e7d Add RPC Events plus reflection plus fix Ctrl+G retry 2021-05-19 19:34:48 -07:00
karlberg 6a643392f0 Merging latest main 2021-05-19 13:37:45 -07:00
karlberg 487e989e68 Several updates to complete rewind support and remove unneeded functionality 2021-05-19 13:27:24 -07:00
puvvadar cb55eaf853 Merge main to mp_editor_pipeline 2021-05-16 11:36:47 -07:00
karlberg c6ea0c0a46 Various local prediction and input processing related fixes 2021-05-15 15:10:17 -07:00
karlberg 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
puvvadar 8a39f9f1b4 Streamline MP Ctrl+G logic via MultiplayerEditorConnection 2021-05-13 15:31:37 -07:00
puvvadar b21553f64d Merge branch 'main' into mp_editor_pipeline 2021-05-10 12:21:45 -07:00
karlberg 80f6dcd258 Build fixes for android 2021-05-07 16:20:00 -07:00
puvvadar aa51233536 Add Asset serialization for Ctrl+G and related net interfaces 2021-05-06 16:18:13 -07:00
karlberg a1fe8fe419 Ported the local prediction player controller component 2021-05-05 20:07:16 -07:00
karlberg a59e212134 Merge branch 'main' into MultiplayerPipeline 2021-04-16 07:58:35 -07:00
karlberg 8074e0fb18 Remove formal template parameter name to resolve shadowed variable warning on clang 2021-04-15 17:56:08 -07:00
karlberg 0ce18593d2 Merging latest main 2021-04-15 17:40:21 -07:00
pereslav 4962218d29 Refactored root spawnable instantiation, added selective instantiation of root spawnable entities 2021-04-16 00:19:43 +01:00
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 2021-04-15 20:24:50 +01:00
karlberg ca3df5d6c8 Various bug fixes to get entity replication working 2021-04-13 20:24:08 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00