stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-27 21:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
14206 commits 173 branches 41 tags 308 MiB
Commit graph

14206 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
7d2b3b0877 Use new two digit version number for HMS 2020-05-13 17:26:34 -07:00
James R
3e936a0878 Oops a debug condition snuck in there 2020-05-13 17:26:34 -07:00
James R
f9ec2a634c Fix switching the master server 2020-05-13 17:26:34 -07:00
James R
47bc3bff13 Put some mutex on CONS_Printf etc. hahaha 2020-05-13 17:26:34 -07:00
James R
ca8b3e95af Fucking multithreading in the server registration 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2020-05-13 17:25:52 -07:00
James R
a80c7a26dd Wait for threads before SDL_Quit (lol) 2020-05-13 17:25:52 -07:00
James R
5fff4c35fc Create cond if it doesn't exist when signaling 2020-05-13 17:25:52 -07:00
James R
00ffb29f95 Use malloc for hms 2020-05-13 17:25:52 -07:00
Steel Titanium
ff8987f745 Support for http downloads 
(cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d)

(cherry picked just the libcurl stuff)
 2020-05-13 17:25:52 -07: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
886bd34be5 Multithreading in my SRB2??? 2020-05-13 17:21:19 -07:00
James R
1584b7394b WHY THE FUCK DID I DO THIS 2020-05-13 17:21:18 -07:00
James R
676865c1b9 Oops 2020-05-13 17:21:18 -07:00
James R
9216406eea Handle NULL hms buffer 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
4fcd24d848 masterserver_update_rate cvar determines wait between updates in minutes 
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
 2020-05-13 17:20:59 -07:00
James R
bb8b279cd4 Don't try to update right after registering 2020-05-13 17:20:59 -07:00
James R
eac7b2e060 Add a hack so the 'All' room isn't display for hosting 2020-05-13 17:20:59 -07:00
James R
4fd707984b Kill the old mserv, long live HMS! 2020-05-13 17:20:59 -07:00
James R
1e4e5275b5 Clean up header text 2020-05-13 17:18:27 -07:00
James R
1f295b8e50 HTTP update alert 2020-05-13 17:18:27 -07:00
James R
1f04f8e0c0 Fix some goofs 2020-05-13 17:18:27 -07:00
James R
ec1d4c9a91 Bruh 2020-05-13 17:18:27 -07:00
James R
bcfbd5563b Clean up a bunch of stuff and follow the Master Server API more closely 2020-05-13 17:18:27 -07:00
James R
b15b90f217 Windows certs do work, thanks Steel! 2020-05-13 17:18:27 -07:00
James R
a4bbc06f25 Handle more errors 2020-05-13 17:18:27 -07:00
James R
f26ad18e28 Kill masterserver_token 2020-05-13 17:18:27 -07:00
James R
273e1ff170 This will be the Master Server in 2020 2020-05-13 17:18:27 -07:00
James R
bec97faf5c Use https because my web server redirects 2020-05-13 17:18:27 -07:00
James R
768ad80a97 strtok can return NULL 2020-05-13 17:18:27 -07:00
James R
9e0c1b3f1f This time I fucked up 2020-05-13 17:18:27 -07:00
James R
bec233515e Windows gaysed: the sequel 2020-05-13 17:18:27 -07:00
James R
acdced643c Windows is weird 2020-05-13 17:18:27 -07:00
James R
2cfb04f90b masterserver_debug to set CURLOPT_VERBOSE 2020-05-13 17:18:27 -07:00
James R
8228182823 Don't show "All" room when hosting 2020-05-13 17:18:27 -07:00
James R
06764dd88e I don't even know my own website 2020-05-13 17:18:26 -07:00
James R
83365e6ce0 lol 2020-05-13 17:18:26 -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
kaysrishaq
7f7ccc9911 musicpref console variable 
Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music.
Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two.
Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.
 2020-05-13 19:20:21 -04:00
MascaraSnake
02c2aeb46a Merge branch 'udmf-next' into udmf-fofs-mkii 2020-05-13 16:23:36 +02:00
MascaraSnake
7413da918b Store PolyObject waypoint return behavior in an enum 2020-05-13 16:21:47 +02:00
MascaraSnake
b561ee7921 Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway 2020-05-13 14:40:07 +02:00
MascaraSnake
acdb4b42ea Merge branch 'actnum-tweaks' into 'next' 
Act number tweaks

See merge request STJr/SRB2!905
 2020-05-13 04:25:53 -04:00
MascaraSnake
9d06cb4be4 Merge branch 'fix-window-icon' into 'master' 
Fix window icon being reset when switching renderers on non-Windows platforms

See merge request STJr/SRB2!898
 2020-05-13 04:14:51 -04:00
MascaraSnake
0e2fb59650 Merge branch 'ogl-gif-fix' into 'master' 
Fix OpenGL only recording the first frame of unoptimized GIFs

See merge request STJr/SRB2!928
 2020-05-13 04:09:58 -04:00
MascaraSnake
ff3768f3e0 Merge branch 'udmf-next' into executordelay 2020-05-13 10:01:41 +02:00
MascaraSnake
1ccda0b85c Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
MascaraSnake
d3ec12c842 Merge branch 'udmf-next' into executordelay 
# Conflicts:
#	src/p_spec.c
 2020-05-13 09:55:25 +02:00
MascaraSnake
aa16bd22f9 Fix accidental swap of first and last waypoint 2020-05-13 09:32:00 +02:00
MascaraSnake
36843cbfd6 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00