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
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
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
970dcea16e
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-23 15:29:31 +01: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
bffb7d1b28
Simplified the change to rely on sv_port cvar
2021-06-03 01:20:22 +01:00
3b519c6475
removed whitespace
2021-06-03 01:06:15 +01:00
c752b9d0fc
Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts
2021-06-03 01:04:01 +01:00
2452149e7d
Add RPC Events plus reflection plus fix Ctrl+G retry
2021-05-19 19:34:48 -07:00
350e5a0cd2
Update to const auto&
2021-05-18 15:22:22 -07:00
e2ade654fb
Address misc feedback
2021-05-18 13:52:28 -07:00
e03645f816
Disable editorsv launch by default
2021-05-18 10:48:39 -07:00
19316e422b
Check launch process exists before waiting for 15 seconds
2021-05-18 10:46:18 -07:00
cf4e04ba57
Cleanup a few more headers
2021-05-17 18:52:40 -07:00
93e267345f
Address string/mem feedback plus some misc cleanup
2021-05-17 18:46:21 -07:00
0d9b55bff2
Move static buffer to member to prevent potential memory issues
2021-05-17 16:48:05 -07:00
83a56ce71c
Cleanup typo
2021-05-17 12:53:15 -07:00
f94d0c99e7
Cleanup connection order slightly
2021-05-17 09:58:58 -07:00
0e53c77516
Fix some include paths
2021-05-15 13:47:03 -07:00
fb51829360
Resolve MP Gem Ctrl+G changes with main
2021-05-15 13:12:16 -07:00
1915b97c16
Cleanup server launch, misc. MP consts, and register Editor Spawnable assets server side
2021-05-15 12:58:30 -07:00
8a39f9f1b4
Streamline MP Ctrl+G logic via MultiplayerEditorConnection
2021-05-13 15:31:37 -07:00
aa51233536
Add Asset serialization for Ctrl+G and related net interfaces
2021-05-06 16:18:13 -07:00
2f4120cdfb
Update Ctrl+G logic to account for prefab processing status and timing
2021-05-03 13:07:11 -07:00
925928bb20
Add MultiplayerEditorGem to clean up logic plus misc. cleanup
2021-04-26 17:28:49 -07:00
8d84737743
Disable Ctrl+G server launch by default
2021-04-22 17:57:54 -07:00
fa781fabc5
Add MultiplayerGem Editor components for Ctrl+G support
2021-04-14 16:20:45 -07:00
Chris Galvan
Steve Pham
pereslav
Gene Walters
SergeyAMZN
puvvadar