Commit graph

376 commits

Author SHA1 Message Date
James R
9bf1f11f91 Compiler errors: won't stop, can't stop 2020-05-13 17:21:18 -07:00
James R
8893243c78 Kill the old mserv, long live HMS! 2020-05-13 17:20:59 -07:00
James R
65ff8e2f00 The big bad HTTP master server
Cvars:

http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
2020-05-13 17:18:26 -07:00
Louis-Antoine
70f4d12d38 Rename some file transfer functions 2020-05-12 19:06:40 +02:00
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Louis-Antoine
9326d18dbd Use W_CachePatchLongName in Snake minigame 2020-05-10 11:02:45 +02:00
Louis-Antoine
d4393925c7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake 2020-05-10 11:00:30 +02:00
Louis-Antoine
d3d01dd8eb Fix compiler warning 2020-05-05 14:05:19 +02:00
Louis-Antoine
0540548a98 Update sound and closed captions in connection screen 2020-04-28 00:37:58 +02:00
Louis-Antoine
829bb84b5e Minor adjustements in Snake minigame 2020-04-27 23:15:18 +02:00
Louis-Antoine
1c78e9cdfb Add bonuses and maluses to Snake minigame 2020-04-27 23:10:13 +02:00
Louis-Antoine
3ab29047bd Add pause and retry to Snake minigame 2020-04-27 22:06:32 +02:00
Louis-Antoine
0bdf93e48d Add a background to Snake minigame 2020-04-27 15:31:38 +02:00
Louis-Antoine
3c43515cbd Use sprites for snake and apple 2020-04-27 13:01:14 +02:00
Louis-Antoine
4b94ebd8fd Lower the download progress bar 2020-04-26 21:57:17 +02:00
Louis-Antoine
472be36b87 Prevent edge warping in Snake minigame 2020-04-26 21:17:15 +02:00
Louis-Antoine
90ef711412 Fix compiler warnings 2020-04-24 22:19:05 +02:00
Louis-Antoine
151fe6be07 Improve controls handling in connection screen minigame 2020-04-24 19:27:42 +02:00
Louis-Antoine
0928375bc4 Add a Snake minigame to the downloading screen 2020-04-24 19:27:29 +02:00
Louis-Antoine
ccf4bbe194 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
Steel Titanium
c1aac7c06e Merge branch 'master' into next 2020-03-31 20:46:54 -04:00
Louis-Antoine
dece2adbe6 Fix allowjoin off affecting single player 2020-03-30 22:11:48 +02:00
Louis-Antoine
b0b21aada6 Fix disconnected players being kicked for high ping 2020-03-28 15:23:15 +01:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SteelT
2e25a5b56d Merge branch 'viewpointswitch-fix' into 'next'
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
LJ Sonic
21cb05b1f7 Merge branch 'fix-playernode-crash' into 'next'
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Monster Iestyn
8d7d0c4dc5 Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
colette
e4a3fcea26 Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
LJ Sonic
e0f3a5b8f5 Merge branch 'lua-io' into 'next'
Support for Lua's I/O library

See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Jaime Passos
745a6bb0f0 Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
Louis-Antoine
2857508dfc Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R
1a251ccee2 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
Louis-Antoine
c785fc2132 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine
59a53908e5 Improve join refusal handling 2020-02-22 02:17:21 +01:00
James R
168a1325f7 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Louis-Antoine
d2e9f0465a Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine
4314d44d42 Fix dedicated servers not running gamelogic
Note to future testers:
Remember to test dedicated servers before merging.
And splitscreen also.
2020-02-15 23:47:11 +01:00
James R
4415fb4c75 Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
James R
9192e1eade Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
Louis-Antoine
74b34ef340 Fix splitscreen player being unable to move 2020-02-01 20:19:39 +01:00
LJ Sonic
0beae26e9d Merge branch 'keep-body' into 'next'
Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722
2020-01-24 18:50:03 -05:00
MascaraSnake
383eccd630 Merge branch 'master' into next 2020-01-24 22:37:25 +01:00
Louis-Antoine
ba0a02d2b3 Be silent when "kicking" a disconnected player
This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.
2020-01-24 19:56:57 +01:00
Louis-Antoine
6d42930c8e Update Lua I/O support to 2.2 2020-01-22 23:08:57 +01:00
Louis-Antoine
93ac266be1 Fix missing declaration 2020-01-22 04:01:06 +01:00
Louis-Antoine
a997683d1c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
c2682ac1b6 Let clients rejoin the server without losing their status
This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.
2020-01-22 03:05:08 +01:00
Confusion
db4cc87be7 Fix title screen broken when leaving during resynch 2020-01-19 17:55:22 +03:00