Commit Graph

82 Commits

Author SHA1 Message Date
Steve Pham 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
hultonha 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
pereslav 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
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
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>
2021-06-30 19:51:55 -07:00
AMZN-Olex d7bfd34a67 IFilterEntityManager work
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-06-30 19:18:06 -04:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
puvvadar d6629eea2e Fix order of ops issue in MP Session Termination 2021-06-24 13:56:16 -07:00
puvvadar 632d774d4c Add disconnect type param to Terminate 2021-06-23 11:44:21 -07: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
puvvadar f2bc80d103 Remove obvious comment 2021-06-21 14:53:19 -07:00
puvvadar f49e5cf645 Validate some base cases in InitializeMultiplayer 2021-06-21 14:49:49 -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
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
puvvadar be71aec4e3 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into mp_systemcomp_cleanup 2021-06-16 15:46:22 -07:00
puvvadar 2b8e87f674 Begin cleaning MPSysComponent 2021-06-16 15:46:10 -07:00
puvvadar 2a6009c94b Cleanup OnDisconnect client case slightly 2021-06-15 17:46:51 -07:00
puvvadar cf5641a211 Cleanup shutdown, activate and deactivate for MPSystemComponent 2021-06-15 14:53:23 -07:00
puvvadar 2eca923694 Rework session validation to work through Connect packet 2021-06-15 14:34:24 -07:00
puvvadar adc09435f4 Cleanup validation failure logic 2021-06-15 11:08:59 -07:00
puvvadar 04bf6c3689 Separate out session validation into its own packet 2021-06-15 10:14:02 -07:00
puvvadar 59d0a8817e Fix inconsistent naming and cover edge case 2021-06-08 22:56:53 -07:00
puvvadar da7870bb2a Fix some typos and comments 2021-06-08 22:46:45 -07:00
puvvadar 056e170eb6 Check for dns name on request player join 2021-06-08 16:48:23 -07:00
puvvadar cd5867d2fa Cleanup session changes and add on connection disconnected event 2021-06-08 16:43:36 -07:00
puvvadar fa55b495c4 Add handling for session provider ticket 2021-06-08 13:36:27 -07:00
puvvadar 2b227a17d1 Remove extraneous code 2021-06-07 17:20:12 -07:00
puvvadar 45b1bbc85c Fix duplicate include 2021-06-07 17:13:52 -07:00
puvvadar 6f4c0c2ce8 Rename interfaces for clarity 2021-06-07 17:12:29 -07:00
puvvadar 03989f77bb Cleanup includes 2021-06-07 17:06:00 -07:00
puvvadar 40c7a6bd2d Integrate remaining requests and rename Handling Requests interfaces for clarity 2021-06-07 17:02:42 -07:00
puvvadar 1d6c69dea2 Merge main to mp_session_integ 2021-06-03 15:36:45 -07:00
puvvadar c55f65b78f Integrate parts of Session Server API 2021-06-03 15:35:16 -07:00
karlberg afeea87862 Fix for linux being a banned keyword 2021-06-02 19:21:39 -07:00
karlberg 38853eb2c2 Linux build fix 2021-06-02 15:34:35 -07:00
karlberg 14bc0ba8ac Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-06-02 14:57:00 -07:00
karlberg a69db3bf76 Converts physx console commands from cry console to az console, fixes some bugs in the multiplayer gem 2021-06-02 14:44:02 -07:00
karlberg 802943bbb3 Bug fixes, naming changes to make variables more clear, and adds a cvar to adjust client window size 2021-05-27 19:54:56 -07:00
Gene Walters b5a0df00e1 Hosts which are not a dedicated server (meaning they also play the game) will spawn a default player for themselves 2021-05-25 17:21:03 -07:00
Gene Walters 12d0d9e7b7 The host will now have autonomy over the default player is has spawned for itself using the sv_defaultPlayerSpawnAsset cvar 2021-05-24 12:49:38 -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 93e267345f Address string/mem feedback plus some misc cleanup 2021-05-17 18:46:21 -07:00
puvvadar cb55eaf853 Merge main to mp_editor_pipeline 2021-05-16 11:36:47 -07:00
karlberg 80bf6d54bc Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-15 15:10:45 -07:00
karlberg c6ea0c0a46 Various local prediction and input processing related fixes 2021-05-15 15:10:17 -07:00