LJ Sonic
60cd6fe986
Merge branch 'next' into 'resend-gamestate'
...
# Conflicts:
# src/d_clisrv.c
2020-03-01 12:35:53 -05:00
LJ Sonic
2cace6e147
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
Louis-Antoine
846560910d
Obliterate resynch
...
Okay, more precisely this substitutes the old resynch with
the newly added gamestate resend code.
2020-03-01 03:22:47 +01:00
Louis-Antoine
29d8389461
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
2020-02-29 13:43:47 +01:00
Louis-Antoine
4f7591a044
Rename packet
2020-02-29 13:40:15 +01:00
Louis-Antoine
a927d67259
Fix warning
2020-02-28 18:17:37 +01:00
James R
f6df71ba54
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
James R
2df4717f18
Fix NO_LUA compiling
2020-02-20 17:20:50 -08:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Louis-Antoine
12959ff4a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io
2020-02-19 22:40:54 +01:00
Louis-Antoine
20d054a679
Minor code cleanup
2020-02-19 22:37:30 +01:00
Louis-Antoine
7b13f0a2de
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
7805828c4a
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
James R
bf3b7fc5b0
Clean player name before joining!!!
2020-02-01 18:20:35 -08:00
Louis-Antoine
7dd0f2b808
Fix splitscreen player being unable to move
2020-02-01 20:19:39 +01:00
Louis-Antoine
d02c4c0cc7
Add "resendgamestate" command
2020-01-31 15:57:04 +01:00
Louis-Antoine
014b93406e
Store most data in gamestate instead of server config packet
2020-01-31 15:29:22 +01:00
LJ Sonic
53e2cfbde2
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
7ac1b9298f
Merge branch 'master' into next
2020-01-24 22:37:25 +01:00
Louis-Antoine
8bd897a269
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
e8760fe5dd
Update Lua I/O support to 2.2
2020-01-22 23:08:57 +01:00
Louis-Antoine
cfec8609f9
Fix missing declaration
2020-01-22 04:01:06 +01:00
Louis-Antoine
f209721ded
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
d374bf4f9b
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
ad505a6fe7
Fix title screen broken when leaving during resynch
2020-01-19 17:55:22 +03:00
Alam Ed Arias
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
James R
223edd8ee0
Merge branch 'disable-titlemap-in-netgames' into 'master'
...
Disable title map when entering a netgame
See merge request STJr/SRB2!683
2020-01-13 16:47:17 -05:00
James R
2b95ea0135
Merge remote-tracking branch 'origin/master' into next
2020-01-12 14:17:52 -08:00
LJ Sonic
6eba68bc3b
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node player mixups
See merge request STJr/SRB2!684
2020-01-12 15:57:20 -05:00
LJ Sonic
34f73ec083
Merge branch 'fix-node-player-mixups' into 'master'
...
Fix node numbers being used in place of player numbers
See merge request STJr/SRB2!681
2020-01-12 15:40:25 -05:00
Louis-Antoine
f6244ec9a4
Disable title map when entering a netgame
2020-01-12 20:08:41 +01:00
Louis-Antoine
e9108de365
Replace all instances of XD_KICK with a SendKick function
2020-01-12 19:43:04 +01:00
Louis-Antoine
5b34923352
Fix node numbers being used in place of player numbers
2020-01-12 18:34:08 +01:00
fickleheart
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
fickleheart
f0e6a56b6b
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
fickleheart
794d74c4d7
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
Alam Ed Arias
a26c5f5428
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
Louis-Antoine
1845266bc8
Do not save netgame-synced console variables
...
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
2020-01-03 00:40:49 +01:00
fickleheart
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
James R
281f30c4fd
Replace gametype with gametypename in SERVERINFO
...
PACKETVERSION 1
2019-12-30 22:18:55 -08:00
James R
80bb6fe7a0
Merge branch 'modid' into 'next'
...
Put a mod name in SERVERINFO
See merge request STJr/SRB2!577
2019-12-30 15:41:08 -05:00
fickleheart
a9b80bf1f0
Merge branch 'master' into newcontrols
...
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
2019-12-30 10:47:09 -06:00
Jaime Passos
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
James R
6bd383621e
More fine tuned versioning
...
You get a PACKETVERSION, for when some packets change format.
You get SRB2APPLICATION, for when you have big fucking mod.
2019-12-25 20:52:02 -08:00
Jaime Passos
a657392d39
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
Jaime Passos
61b72203a8
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
James R
f584b61c93
Use a random port when connecting
2019-12-18 15:34:55 -08:00
Jaime Passos
aa619e1b34
Rankings tweaks
2019-12-18 12:36:02 -03:00
Jaime Passos
7807424633
NUMGAMETYPES vs gametypecount
2019-12-18 12:30:01 -03:00
Jaime Passos
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
