d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05: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
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
21ebff5709
Updated help search and all docs.o3de.org links to o3de.org ( #1594 )
2021-06-25 15:23:57 -05: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
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
4d0d97b3fe
Remove excessive assert
2021-06-21 16:52:05 -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
a748c2e152
Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking
2021-06-17 16:17:36 -07:00
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
76a6df341b
SPEC-2513 Fixes to enable w4457
2021-06-04 10:51:47 -07:00
8a39f9f1b4
Streamline MP Ctrl+G logic via MultiplayerEditorConnection
2021-05-13 15:31:37 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
Chris Galvan
Steve Pham
pereslav
Gene Walters
Terry Michaels
puvvadar
Mike Balfour
stramer
Esteban Papp
alexpete