wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
wolfs
741f48132a
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
Monster Iestyn
a0e135f1b8
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
7a66fabf4f
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
James R
fd251ed29f
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
wolfs
f624d2acda
Merge branch 'save-showjoinaddress' into 'master'
...
Save showjoinaddress to config
See merge request KartKrew/Kart-Public!132
2019-04-25 23:17:07 -04:00
Steel Titanium
cae59aad9a
Save showjoinaddress to config
2019-04-25 23:13:09 -04:00
James R
7fd1f6c528
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
2019-04-14 21:14:01 -07:00
James R
b28221bdb2
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
James R
03c27101df
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07: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
Alam Arias
635a38091e
Merge branch 'master' into next
2019-03-02 18:41:58 -05: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