incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18798 commits 1 branch 0 tags 204 MiB
Commit graph

93 commits

Author SHA1 Message Date
LJ Sonic
4b1ba2974d Do not attempt to disconnect when a packet checksum is invalid 2022-03-18 20:35:07 +00:00
James R
59c04ae041 pedantic: resolve flexible array member in nested struct 
ISO C forbids a structure that has a flexible array member
to be a member of another structure or element of an
array.

filetx_pak and fileack_pak are two such structures. These
have been removed from doomdata_t's union.
 2022-02-20 03:10:27 -08:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next 
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
 2021-02-27 05:18:36 -05:00
James R
c8d4ef64f9 Hole punching 2020-11-12 17:08:34 -08:00
Louis-Antoine
8471f9e71f Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
 2020-08-13 13:53:10 +02:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
6ddae4728f Merge d_net.c 2020-08-02 14:15:29 -04: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
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04: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
ebeac311af Add missing packet name 2020-05-16 23:22:33 +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
Wolfy
f35bdf3bb7 Revert basically every attempted join passwords fix 2020-04-26 01:20:46 -07:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
Wolfy
7444dd34ab Add PT_CLIENTCMD back to allowed packet types 
Fixes unexpected CLIENTCMD prints
 2020-04-07 07:09:51 -05:00
Wolfy
6ea0492008 Potentially fix join passwords 2020-04-05 18:57:47 -05:00
Wolfy
e6d7af623a Revert "PT_CLIENTCMD test" 
This reverts commit e2feca3dc7.
 2020-04-05 17:18:22 -05:00
Wolfy
e2feca3dc7 PT_CLIENTCMD test 2020-04-05 17:01:40 -05:00
Wolfy
2c54c32eb3 Fix packet type desync 2020-04-05 16:11:30 -05:00
Latapostrophe
29781688e8 Merge branch 'v1-ignore-posthumous-ackret' into awful-mix 2020-04-05 11:23:49 +02:00
Latapostrophe
dc00dbdeee Merge branch 'ignore-posthumous-ackret' of git.magicalgirl.moe:KartKrew/Kart-Public into v1-ignore-posthumous-ackret 2020-04-05 11:23:29 +02:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
LJ Sonic
f0cf62672a Merge branch 'next' into 'resend-gamestate' 
# Conflicts:
#   src/d_clisrv.c
 2020-03-01 12:35:53 -05: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
Louis-Antoine
b1dbc824a8 Update packet names 2020-03-01 03:26:15 +01:00
Louis-Antoine
fc07604031 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 2020-02-29 13:43:47 +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
5eae1ca914 Add "resendgamestate" command 2020-01-31 15:57:04 +01:00
Louis-Antoine
6d42930c8e Update Lua I/O support to 2.2 2020-01-22 23:08:57 +01:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Louis-Antoine
d3ba98a753 Temporary fix for the fade timeout 2019-12-03 12:02:14 +01:00
James R
8f48c7f21d Replace ping command with a condensed and sorted version 2019-10-22 19:40:05 -07:00
James R
4f5d32a73f "NEWPING" might as well be the only ping 2019-10-22 19:39:26 -07:00
Latapostrophe
ec1272dd14 remove join passwords 2019-08-04 11:26:26 +02:00
James R
2fa20751e9 Replace ping command with a condensed and sorted version 2019-04-08 15:57:23 -07:00
James R
03c27101df "NEWPING" might as well be the only ping 2019-04-08 15:48:20 -07:00
fickleheart
61c340efe6 Alternate variant of ugly probably-bad hack 2019-03-30 23:15:11 -05:00
fickleheart
9193b70ecd Try to fix hangs caused by PT_CLIENTJOIN with a non-zero ack 2019-03-30 22:48:55 -05:00
fickleheart
c37b570cf9 Fix compile issues 2019-03-26 08:26:41 -05:00
fickleheart
5a138981a8 pbbbbt fix compile error 2019-03-25 22:52:42 -05:00
fickleheart
bffe706288 Make sure clients never have local_resynchinprogress on when joining a game... 2019-03-25 22:49:37 -05:00
fickleheart
11a10a839c More attempts that may fix things? 
I'm uncommenting a bunch of LJ code that was never
committed uncommented, so I might be breaking something
horribly here....
 2019-03-25 22:44:34 -05:00
fickleheart
307f4a0638 Wacky attempt at not reopening nodes for D/Ced ackreting clients 2019-03-25 22:22:25 -05:00
fickleheart
a2f849c49c Update packettypenames 2019-03-10 16:06:46 -05:00
fickleheart
283bb3aa66 Check password and etc before downloading files 2019-03-09 13:30:22 -06:00
Sryder
8ba981a9cb The string that got away from my memory 2019-02-04 22:02:40 +00:00
Sryder
243240de64 rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does 2019-02-02 21:53:27 +00:00