Commit graph

637 commits

Author SHA1 Message Date
fickleheart
bffe706288 Make sure clients never have local_resynchinprogress on when joining a game... 2019-03-25 22:49:37 -05:00
fickleheart
ee884dccaa Don't force-close connection when getting a join request!
We need to send the ackret, first of all!
2019-03-25 22:23:35 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
0c6c401d88 Add title to netreplays and do some format cleanup 2019-03-24 18:48:14 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
Steel Titanium
adcc8fe0d8 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
Sryder
fd59bfc341 Move FORCECLOSE definition to be out of NONET ifdef
Should this just be moved into d_net.h instead of defining it here and in d_net.c?
2019-03-11 00:13:43 +00:00
Sryder
e59481735f Fix compile warnings. 2019-03-10 23:51:52 +00:00
fickleheart
a16243e84d Deduplicate character shifting code 2019-03-10 18:09:15 -05:00
fickleheart
40c77df793 Make sure we don't write kartspeed beyond SV_SPEEDMASK 2019-03-10 17:43:39 -05:00
fickleheart
892b4e77d9 Make noises on the password entry screen 2019-03-10 17:36:16 -05:00
fickleheart
7bd8effc65 Draw a padlock on-screen! 2019-03-10 17:25:55 -05:00
fickleheart
1cd8c15e8c Show notice of a password-protected server on the join screen 2019-03-10 17:00:27 -05:00
fickleheart
99a934e352 Properly close the connection on the server's side... 2019-03-10 16:22:03 -05:00
fickleheart
99cf366e6e Skip password check if node is already in-game? idk 2019-03-10 15:48:11 -05:00
fickleheart
f8a75cb4fc Improve stability when joining netgames maybe 2019-03-10 12:50:24 -05:00
fickleheart
9f48006254 Try a partial disconnect instead 2019-03-09 23:56:13 -06:00
fickleheart
28e4cfdb6d Properly close and reopen the client connection for password challenges 2019-03-09 23:36:11 -06:00
fickleheart
fe651ae79b Revert "Move HandleConnect to the same place as other packets"
This reverts commit 055d73c1e7.
2019-03-09 22:17:16 -06:00
fickleheart
bc647657f4 Fix password auto-hiding if you type into it 2019-03-09 17:06:44 -06:00
fickleheart
60296de106 More... 2019-03-09 16:49:23 -06:00
fickleheart
640b9016d7 Show kartspeed and password status on server browser 2019-03-09 14:30:04 -06:00
fickleheart
283bb3aa66 Check password and etc before downloading files 2019-03-09 13:30:22 -06:00
fickleheart
055d73c1e7 Move HandleConnect to the same place as other packets 2019-03-09 12:01:47 -06:00
fickleheart
96b47d3065 Don't shoot asterisks off-screen on the join password screen 2019-03-06 23:34:30 -06:00
fickleheart
8a022670bd Fix freeze when trying to host with a join password already set 2019-03-06 23:32:47 -06:00
fickleheart
b696e68def Recycle oldest challenges first if all are taken 2019-03-06 22:36:13 -06:00
fickleheart
9e9dcf759a Show message on incorrect password 2019-03-06 22:11:35 -06:00
fickleheart
1da3d7cc48 Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
fickleheart
b9543d18b4 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
fickleheart
843bc6bc1b Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
Alam Arias
635a38091e Merge branch 'master' into next 2019-03-02 18:41:58 -05:00
Monster Iestyn
70d1006800 Merge branch 'public_next'
# Conflicts:
#	src/sdl12/Srb2SDL-vc10.vcxproj
#	src/sdl12/Srb2SDL-vc9.vcproj
#	src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Alam Arias
47c32fa785 fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Ed Arias
2eb26bc68e Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Sally Cochenour
5d20a15b6b Extend pingtable by 1 for the servermaxping entry 2019-02-26 17:44:35 -05:00
Sally Cochenour
69a9efeb6f Remove mixed declaration that triggers ERRORMODE on my setup 2019-02-26 17:33:10 -05:00
Sal
ea0da92c22 Merge branch 'ping-stuff-take2' into 'next'
Ping improvements

See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
Sal
5f4e52b4d8 Merge branch 'expose-splitscreen' into 'next'
Expose splitscreenplayer in player_t

See merge request KartKrew/Kart-Public!74
2019-02-22 19:04:48 -05:00
James R
f8928300ec Rename splitscreen member to something more meaningful 2019-02-22 15:57:44 -08:00
Steel Titanium
deb58b0e68 Save ban list right after banning. 2019-02-21 19:47:00 -05:00
Steel Titanium
4f5d698d80 Add command to ban an IP address. 2019-02-21 19:44:18 -05:00
Steel Titanium
8a3fa4ebed Some small changes. 2019-02-19 21:22:35 -05:00
Steel Titanium
141338c7c1 Save when quitting the game.
Also use default reason if not custom reason is given.
2019-02-18 02:04:58 -05:00
Steel Titanium
5e2cea3980 Save ban list right after banning. 2019-02-18 01:03:39 -05:00
Steel Titanium
a1df64a365 Add command to ban an IP address. 2019-02-18 00:58:08 -05:00
james
76f2df2c40 Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t 2019-02-16 23:25:50 -08:00
fickleheart
15f6e3de48 Remove unnecessary ResetViews call 2019-02-16 22:19:17 -06:00
Latapostrophe
542b8c4920 Remove debug stuff 2019-02-15 21:10:18 -06:00