stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 02:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
12300 commits 172 branches 41 tags 280 MiB
Commit graph

438 commits

Author SHA1 Message Date
James R
288ffebea7 Do not save cleared ban list when reloading bans 2020-10-24 15:52:02 -07:00
Louis-Antoine
50d2c95470 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
Louis-Antoine
5091c19abf Kick clients that fail to catch up with server gamelogic 2020-10-21 20:25:29 +02:00
James R
d279489753 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
Hannu Hanhi
4f20a20165 Performance stats 2020-10-10 22:12:34 +03:00
James R
f5e4d076b9 Add CV_NETVAR to server affecting cvars 
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
 2020-10-09 15:23:16 -07:00
James R
aa102dcea0 Add CV_SAVE to netvars 
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime

tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
 2020-10-09 15:06:09 -07:00
James R
b3d8ed7d43 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R
dbd79a29a4 Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
Lachlan Wright
92b61aacd8 Merge branch 'name-change-spam' into 'next' 
Don't let players change their name more than five times per minute

See merge request STJr/SRB2!1155
 2020-09-25 09:36:39 -04:00
Lachlan Wright
86b7957b61 Merge branch 'clarity' into 'next' 
Add-on clarity from Kart

See merge request STJr/SRB2!1153
 2020-09-25 09:33:04 -04:00
Lachlan Wright
c42f247ce5 Merge branch 'snake-fixes' into 'next' 
Fix bonus items sometimes overriding apples in Snake minigame

See merge request STJr/SRB2!1134
 2020-09-25 09:23:33 -04:00
Lachlan Wright
982435cf86 Merge branch 'more-stats' into 'next' 
Add tic and UI times to render stats

See merge request STJr/SRB2!1125
 2020-09-25 08:54:01 -04:00
James R
b655fa496e Don't let players change their name more than five times per minute 
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
 2020-09-22 12:04:28 -07:00
Zippy_Zolton
62f379ec41 Add-on clarity from Kart 2020-09-20 13:07:28 -05:00
James R
679bfa21ed Fix stupid NONET 2020-08-29 17:51:59 -07:00
James R
a6e59cbb24 Do not do master server things when NOCURL 
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
 2020-08-29 17:45:28 -07:00
Louis-Antoine
cb06d05692 Fix bonus items sometimes overriding apples in Snake minigame 2020-08-24 00:34:44 +02:00
Hannu Hanhi
dd7d1e40b1 Add tic and ui times to render stats 2020-08-23 20:09:55 +03:00
James R
405639bc78 Disable showjoinaddress by default 2020-08-14 21:05:23 -07:00
Louis-Antoine
9dd5c11322 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
James R
54e446199d Merge remote-tracking branch 'origin/next' into http-mserv 2020-08-08 15:05:03 -07:00
Steel Titanium
e9a03401cb Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
James R
479bbeacbe Merge remote-tracking branch 'origin/next' into http-mserv 2020-07-11 17:41:46 -07:00
James R
99e0c48f7b Fix a lot of stuff related to the version automation 2020-07-10 22:39:46 -07:00
Louis-Antoine
f8aefc2fd3 Revert "Fix computation of very high pings" 
This reverts commit 82dbe95e22.
 2020-07-11 01:55:40 +02:00
Louis-Antoine
78f8a44c25 Fix timeout 2020-07-07 02:06:26 +02:00
James R
e56fc08757 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
22459df1f1 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
c96e07b61c Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines 2020-06-27 02:01:16 +02:00
Louis-Antoine
82dbe95e22 Fix computation of very high pings 2020-06-26 15:34:26 +02:00
Zachary McAlpin
08e9efee76 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
LJ Sonic
7ffee074d8 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/d_clisrv.c
 2020-06-10 07:57:49 -04:00
LJ Sonic
bc2edb2ae4 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
291479e3e8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
Louis-Antoine
e6ffedbce8 Fix food occasionally spawning inside the snake 2020-06-01 15:21:16 +02:00
LJ Sonic
715cb857f5 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
e2b860dc28 Merge branch 'next' into 'fix-spawn-desynch' 
# Conflicts:
#   src/p_map.c
 2020-06-01 08:15:02 -04:00
Zachary McAlpin
7bdea21435 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
LJ Sonic
aab6339e66 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
1c42102ddb 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
67eef5a37f Fix potential desynch when a player spawns 2020-05-28 11:03:35 +02:00
Louis-Antoine
bb1e3fdf13 Add a few missing calls to GameQuit hook 2020-05-27 14:58:10 +02:00
Monster Iestyn
40566e6926 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
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
Louis-Antoine
c8948909d3 Fix I_Error when queuing multiple Lua files 2020-05-19 23:50:37 +02:00
Louis-Antoine
f620b52672 Fix sending Lua files in text mode 2020-05-19 21:36:21 +02:00
Louis-Antoine
56cc5190e5 Allow input buffer to hold more than 64 tics 2020-05-18 11:34:09 +02:00
Louis-Antoine
e49d3d0bb9 Use per-node reference tics in ExpandTics 2020-05-17 20:23:07 +02:00
Louis-Antoine
fc07db26c0 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
66ecfb741a Show total size when downloading gamestate 2020-05-16 22:49:20 +02:00
Louis-Antoine
3c7c758d17 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
James R
7ebde22b77 Make mod update, room list and server list multithreaded 
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
 2020-05-13 17:24:27 -07:00
James R
1584b7394b WHY THE FUCK DID I DO THIS 2020-05-13 17:21:18 -07:00
James R
197cffb7f5 Compiler errors: won't stop, can't stop 2020-05-13 17:21:18 -07:00
James R
4fd707984b Kill the old mserv, long live HMS! 2020-05-13 17:20:59 -07:00
James R
06da1425b3 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
061fd4761a Rename some file transfer functions 2020-05-12 19:06:40 +02:00
sphere
0287c6956e Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
Louis-Antoine
dc55ab9ae2 Use W_CachePatchLongName in Snake minigame 2020-05-10 11:02:45 +02:00
Louis-Antoine
614f45b380 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake 2020-05-10 11:00:30 +02:00
Louis-Antoine
2d6c9a94f4 Fix compiler warning 2020-05-05 14:05:19 +02:00
Louis-Antoine
752b48de3a Update sound and closed captions in connection screen 2020-04-28 00:37:58 +02:00
Louis-Antoine
231a835bf6 Minor adjustements in Snake minigame 2020-04-27 23:15:18 +02:00
Louis-Antoine
dfdace22bb Add bonuses and maluses to Snake minigame 2020-04-27 23:10:13 +02:00
Louis-Antoine
a3dcc100c0 Add pause and retry to Snake minigame 2020-04-27 22:06:32 +02:00
Louis-Antoine
647d74bad5 Add a background to Snake minigame 2020-04-27 15:31:38 +02:00
Louis-Antoine
58c0383e88 Use sprites for snake and apple 2020-04-27 13:01:14 +02:00
Louis-Antoine
380e246be3 Lower the download progress bar 2020-04-26 21:57:17 +02:00
Louis-Antoine
7c9ce1faee Prevent edge warping in Snake minigame 2020-04-26 21:17:15 +02:00
Louis-Antoine
10fbaaf781 Fix compiler warnings 2020-04-24 22:19:05 +02:00
Louis-Antoine
d235d401bc Improve controls handling in connection screen minigame 2020-04-24 19:27:42 +02:00
Louis-Antoine
9ac3fd202f Add a Snake minigame to the downloading screen 2020-04-24 19:27:29 +02:00
Louis-Antoine
9ec4ba3824 Add a minimum delay between connections 2020-04-24 14:05:15 +02:00
Steel Titanium
9a242818a7 Merge branch 'master' into next 2020-03-31 20:46:54 -04:00
Louis-Antoine
ad12e29fda Fix allowjoin off affecting single player 2020-03-30 22:11:48 +02:00
Louis-Antoine
8130599a4f Fix disconnected players being kicked for high ping 2020-03-28 15:23:15 +01:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SteelT
bd058ecc4b 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
0a54c40ff4 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
ddc0762ecc Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
Louis-Antoine
b85ac65378 Fix missing break 2020-03-08 20:04:29 +01:00
colette
ce29129f3a Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
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
Jaime Passos
0362f53e9b Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
Louis-Antoine
d19fe295e0 Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R
f6df71ba54 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
Louis-Antoine
778715f611 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine
af9164f336 Improve join refusal handling 2020-02-22 02:17:21 +01: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