Commit graph

351 commits

Author SHA1 Message Date
James R
f4989f36bd Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
Louis-Antoine
49ad2c7313 Revert "Fix computation of very high pings"
This reverts commit 8b78811651.
2020-07-11 01:55:40 +02:00
Louis-Antoine
e3ef4d966a Fix timeout 2020-07-07 02:06:26 +02:00
James R
71dedde5eb Merge branch 'delete-connection-screen-and-midgame-joins' into 'next'
Delete connection screen and midgame joins

See merge request STJr/SRB2!1021
2020-06-28 18:41:07 -04:00
SteelT
07c84dc854 Merge branch 'increase-input-buffer-more' into 'next'
Increase the length of the player input buffer even more

See merge request STJr/SRB2!951
2020-06-27 13:32:19 -04:00
Louis-Antoine
36ad16452c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine
8b78811651 Fix computation of very high pings 2020-06-26 15:34:26 +02:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
LJ Sonic
3203d4a62e Merge branch 'next' into 'better-download'
# Conflicts:
#   src/d_clisrv.c
2020-06-10 07:57:49 -04:00
LJ Sonic
5e7ffb055f Merge branch 'snake' into 'next'
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
2020-06-10 07:38:37 -04:00
Zachary McAlpin
3a8e053d9d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
Louis-Antoine
293c8ad75b Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic
05e8d12427 Merge branch 'next' into 'better-download'
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
LJ Sonic
aeeb6e1b02 Merge branch 'next' into 'fix-spawn-desynch'
# Conflicts:
#   src/p_map.c
2020-06-01 08:15:02 -04:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
LJ Sonic
8c5149f180 Merge branch 'possibly-fix-dedi-crash' into 'next'
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)

See merge request STJr/SRB2!963
2020-05-28 11:29:00 -04:00
SteelT
2739f989dc Merge branch 'fix-input-buffer' into 'next'
Allow input buffer to hold more than 64 tics

See merge request STJr/SRB2!950
2020-05-28 11:27:39 -04:00
Louis-Antoine
d886e35576 Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Louis-Antoine
3483ddf573 Add a few missing calls to GameQuit hook 2020-05-27 14:58:10 +02:00
Monster Iestyn
9a122fd9c4 Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array 2020-05-25 21:27:48 +01:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
Louis-Antoine
6e073efbb7 Fix I_Error when queuing multiple Lua files 2020-05-19 23:50:37 +02:00
Louis-Antoine
ccc51df93b Fix sending Lua files in text mode 2020-05-19 21:36:21 +02:00
Louis-Antoine
d6aed61ded Allow input buffer to hold more than 64 tics 2020-05-18 11:34:09 +02:00
Louis-Antoine
dc527a8afb Use per-node reference tics in ExpandTics 2020-05-17 20:23:07 +02:00
Louis-Antoine
24bd03cd22 Store starttic as a raw value in PT_SERVERTICS packets
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
2020-05-17 20:09:11 +02:00
Louis-Antoine
35c987e731 Show total size when downloading gamestate 2020-05-16 22:49:20 +02:00
Louis-Antoine
c221b76716 Rewrite file transfer code
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
2020-05-16 22:09:00 +02: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