Sal
f60d05764d
Merge branch 'clearbans-please' into 'master'
...
Write empty file on clearbans
See merge request KartKrew/Kart-Public!156
2020-05-15 19:29:11 -04:00
James R
233e6627de
Merge remote-tracking branch 'origin/master' into http-mserv
2020-05-12 17:50:32 -07:00
ThatAwesomeGuy173
6519da0d9f
Display refusal message if there is no HTTP source and internal downloads are disabled
2020-05-09 06:06:21 -06:00
James R
a1aa2a5e12
Fix switching the master server
2020-04-28 14:21:57 -07:00
James R
c96506dd3b
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-04-26 19:46:35 -07:00
James R
273b20d81d
Download mismatched md5sum with http
...
This is from b25acfa7
2020-04-26 01:29:40 -07:00
James R
974f9e667b
Fallback you doofus!
2020-04-26 01:28:01 -07:00
Wolfy
fcea81e018
Revert basically every attempted join passwords fix
2020-04-26 01:20:46 -07:00
James R
b3247b48a1
Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked
2020-04-26 01:16:27 -07:00
James R
bb3dcf7d5f
Revert "Reorder join process so password is authenticated before attempting to download"
...
This reverts commit b25acfa782
.
2020-04-26 01:12:40 -07:00
James R
10582beb2a
Revert "Don't send httpsource in SERVERINFO if join password is set"
...
This reverts commit abd15288b4
.
2020-04-26 01:12:39 -07:00
James R
ccb6da9ab7
Revert "Request a download after completing the join challenge"
...
This reverts commit d5ca4d3f42
.
2020-04-26 01:11:25 -07:00
Wolfy
c52ce92016
Shut the compiler up
2020-04-21 19:25:18 -05:00
Ashnal
e33e15d87f
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
James R
4ed99c60bb
More fine tuned versioning
...
You get a PACKETVERSION, for when some packets change format.
You get SRB2APPLICATION, for when you have big fucking mod.
(cherry picked from commit 6bd383621eee92b215f86c9c4b483934d7e60daa)
2020-04-20 19:59:42 -07:00
James R
b341b87a92
Fuck acks!!!!
2020-04-18 18:47:57 -07:00
James R
d5ca4d3f42
Request a download after completing the join challenge
2020-04-18 18:45:50 -07:00
James R
7b714a225b
WHY THE FUCK DID I DO THIS
2020-04-15 22:04:55 -07:00
James R
7488991ecd
Compiler errors: won't stop, can't stop
2020-04-13 23:31:26 -07:00
James R
1201e89132
Kill the old mserv, long live HMS!
2020-04-13 22:23:01 -07:00
James R
8c9e5fc644
Whoops I fucked that up
2020-04-13 17:45:02 -07:00
James R
abd15288b4
Don't send httpsource in SERVERINFO if join password is set
2020-04-13 17:40:48 -07:00
James R
b25acfa782
Reorder join process so password is authenticated before attempting to download
2020-04-13 17:30:42 -07:00
Sally Cochenour
1fac0505a4
No more modulo bullshit in VERSION
...
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision
# Conflicts:
# src/doomdef.h
2020-04-12 23:32:15 -05:00
Wolfy
c68e1c53f3
Fix off by one error in http downloader
2020-04-12 21:14:33 -05:00
wolfs
dcfaba2cc6
Merge branch 'http-downloads' into 'awful-mix'
...
Support for http downloads
See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium
9293c6cb32
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
2020-04-12 17:56:12 -04:00
Steel Titanium
2dd7854a9b
Remove some of these superfluous ifdef checks.
...
Allows compatibility with non-curl enabled builds.
2020-04-12 15:07:39 -04:00
James R
4b68b41a31
Fix lol xd compiler errors
2020-04-07 17:06:20 -07:00
Steel Titanium
f4002f076e
Fix even more build errors
2020-04-07 19:14:27 -04:00
Steel Titanium
cb9004e4cf
Fix some build errors
2020-04-07 19:07:39 -04:00
Steel Titanium
6fcc06bf72
Support for http downloads
2020-04-07 18:22:29 -04:00
Wolfy
2406302911
Potentially fix join passwords
2020-04-05 18:57:47 -05:00
Latapostrophe
b483e42d94
Merge branch 'v1-ignore-posthumous-ackret' into awful-mix
2020-04-05 11:23:49 +02:00
Latapostrophe
86986adf6e
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
Latapostrophe
0ee6426830
Remove debug prints
2020-03-11 19:53:52 +01:00
Latapostrophe
6da057167d
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
428dc42e2d
Remove debug print
2020-03-10 10:21:47 +01:00
fickleheart
11cba9bd6a
I'M GONNA PISS MYSELF OF LAUGHER anyway fixed syncbombs
2020-03-07 12:40:45 -06:00
fickleheart
b8e4af3f8d
SUPER EXPERIMENTAL FREEZE-B-GONE
2020-03-05 22:19:39 -06:00
TehRealSalt
190b0d4660
Replay playback changes:
...
- Store level state periodically
- Load the closest usable level state when done rewinding for
quicker resumes
- Make playback menu fade out after 5 seconds of no activity
(but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo
from fickleheart
2020-03-05 21:04:56 +01:00
James R
e2507f390f
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-03-01 02:36:56 -08:00
Latapostrophe
bee60709ec
I'm an idiot and forgot to let you download files
2019-09-09 22:26:09 +02:00
James R
3838700f2c
Save bans when cleared too
...
(Why doesn't it work for I_Quit?)
2019-08-22 15:18:14 -07:00
Latapostrophe
61d7fc8b48
remove join passwords
2019-08-04 11:26:26 +02:00
Sryder
935fec1e15
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
wolfy852
f61f7f4411
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
2c363c4e1e
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
47484c5b6b
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
TehRealSalt
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
Sal
2dc91d1723
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
wolfs
58c5979a1e
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
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
TehRealSalt
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
5dc30cdac8
Fix skin shit
2019-05-02 00:39:49 -04:00
James R
848bb10c36
Move some cvars out of D_ClientServerInit and save them
2019-04-27 17:30:39 -07:00
wolfs
e6ba65bac9
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
21e8a2c537
Save showjoinaddress to config
2019-04-25 23:13:09 -04:00
TehRealSalt
1f61397545
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
ac53d4bbb3
Show when we're waiting for the full wadlist
2019-04-18 00:39:54 -05:00
fickleheart
b59645e1b1
Send the rest of the file list
2019-04-18 00:30:28 -05:00
fickleheart
0e2bef3f1a
Wait, we don't need pages, just first file index...
2019-04-17 23:51:15 -05:00
fickleheart
a36700e176
Some stuff toward reading those files
2019-04-17 23:42:49 -05:00
fickleheart
6c5ac8e942
Paginate PutFileNeeded
2019-04-17 23:29:27 -05:00
James R
d7e964bd54
Support splitscreen PLAYERINFO and don't expose clients' IP addresses
2019-04-14 21:14:01 -07:00
James R
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
James R
42d47a10f3
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07:00
fickleheart
9bc3acd17a
Fix compile issues
2019-03-26 08:26:41 -05:00
fickleheart
7090cf16b4
Unclose a node if it sends PT_CLIENTJOIN..? fuck it, why not
2019-03-26 01:36:12 -05:00
fickleheart
6cf7cc0276
Is this useful in any way?
2019-03-26 00:09:23 -05:00
fickleheart
204a6d5c20
Let's try some sanity checks on the resync code...
2019-03-25 23:58:44 -05:00
fickleheart
29f460a21f
pbbbbt fix compile error
2019-03-25 22:52:42 -05:00
fickleheart
0485b4cf5c
Make sure clients never have local_resynchinprogress on when joining a game...
2019-03-25 22:49:37 -05:00
fickleheart
a35e9d5abd
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
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
c7109c0ae4
Add title to netreplays and do some format cleanup
2019-03-24 18:48:14 -05:00
fickleheart
7fc1f02b07
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
2fb569857a
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
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Sryder
b9c3e56500
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
07ecfbc1d7
Fix compile warnings.
2019-03-10 23:51:52 +00:00
fickleheart
c65ff70faf
Deduplicate character shifting code
2019-03-10 18:09:15 -05:00
fickleheart
0e58653727
Make sure we don't write kartspeed beyond SV_SPEEDMASK
2019-03-10 17:43:39 -05:00
fickleheart
048ce8496f
Make noises on the password entry screen
2019-03-10 17:36:16 -05:00
fickleheart
4a8d682b43
Draw a padlock on-screen!
2019-03-10 17:25:55 -05:00
fickleheart
f70163cfb9
Show notice of a password-protected server on the join screen
2019-03-10 17:00:27 -05:00
fickleheart
693da54d94
Properly close the connection on the server's side...
2019-03-10 16:22:03 -05:00
fickleheart
82f3d2cdb8
Skip password check if node is already in-game? idk
2019-03-10 15:48:11 -05:00
fickleheart
bafa4cee7b
Improve stability when joining netgames maybe
2019-03-10 12:50:24 -05:00
fickleheart
ce81504410
Try a partial disconnect instead
2019-03-09 23:56:13 -06:00
fickleheart
386360ff43
Properly close and reopen the client connection for password challenges
2019-03-09 23:36:11 -06:00
fickleheart
3e1570c59d
Revert "Move HandleConnect to the same place as other packets"
...
This reverts commit 6bba2f16c0
.
2019-03-09 22:17:16 -06:00
fickleheart
d804dc3a34
Fix password auto-hiding if you type into it
2019-03-09 17:06:44 -06:00
fickleheart
7c7034a229
More...
2019-03-09 16:49:23 -06:00
fickleheart
d5691b9289
Show kartspeed and password status on server browser
2019-03-09 14:30:04 -06:00
fickleheart
2954b68e12
Check password and etc before downloading files
2019-03-09 13:30:22 -06:00
fickleheart
6bba2f16c0
Move HandleConnect to the same place as other packets
2019-03-09 12:01:47 -06:00
fickleheart
18dba65f17
Don't shoot asterisks off-screen on the join password screen
2019-03-06 23:34:30 -06:00
fickleheart
ddf2db8a36
Fix freeze when trying to host with a join password already set
2019-03-06 23:32:47 -06:00