James
fc862c999d
Bad parathesis
2019-10-19 01:48:56 -04:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
James R
1b0ba7768c
False instead of 0, a little clearer
2019-10-02 13:57:14 -07:00
James R
8cbdc999f4
Block playing by yourself in TESTERS build with le funni message
...
SV_SpawnServer is called in instances other than joining
a server or watching a replay. How convenient, huh?
2019-09-27 19:19:04 -07:00
TehRealSalt
e502a74a3f
Use memset
2019-09-23 20:19:57 -04:00
TehRealSalt
9072f233eb
Remove a few more magic numbers
2019-09-23 08:31:36 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
9e587f4d0d
Put prints behind CONS_Debug
2019-09-23 07:26:36 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
James R
374af9a322
Merge remote-tracking branch 'pub/master' into public-master
2019-07-17 12:33:20 -07:00
Sryder
3d6161c7ca
Fix compatibility with the MS (Specifically Doomseeker)
...
Send back 32 players worth of playerinfo regardless of MAXPLAYERS. Fill the extra with unconnected nodes.
2019-06-17 21:04:48 +01:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
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
TehRealSalt
d82fa7eb60
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
Sal
80226b3c39
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04: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
TehRealSalt
f1f664e9b1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04:00
James R
fd251ed29f
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
TehRealSalt
ed093e0856
Display on server browser
2019-04-26 14:07:48 -04: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
TehRealSalt
ea2bcb3b99
Update from master
2019-04-19 20:14:06 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
cc7699a371
Show when we're waiting for the full wadlist
2019-04-18 00:39:54 -05:00
fickleheart
a83f887cb3
Send the rest of the file list
2019-04-18 00:30:28 -05:00
fickleheart
d7ed880e81
Wait, we don't need pages, just first file index...
2019-04-17 23:51:15 -05:00
fickleheart
ebf0367828
Some stuff toward reading those files
2019-04-17 23:42:49 -05:00
fickleheart
8aa719108d
Paginate PutFileNeeded
2019-04-17 23:29:27 -05: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
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
