Commit graph

9582 commits

Author SHA1 Message Date
James R
79ce8a4bfc WHY THE FUCK DID I DO THIS 2020-05-13 17:21:18 -07:00
James R
5d6a199a01 Oops 2020-05-13 17:21:18 -07:00
James R
1567703101 Handle NULL hms buffer 2020-05-13 17:21:18 -07:00
James R
9bf1f11f91 Compiler errors: won't stop, can't stop 2020-05-13 17:21:18 -07:00
James R
5bcce64053 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
6787f77304 Don't try to update right after registering 2020-05-13 17:20:59 -07:00
James R
717ab3526a Add a hack so the 'All' room isn't display for hosting 2020-05-13 17:20:59 -07:00
James R
8893243c78 Kill the old mserv, long live HMS! 2020-05-13 17:20:59 -07:00
James R
ba786e7cf8 Clean up header text 2020-05-13 17:18:27 -07:00
James R
35e4bf9f33 HTTP update alert 2020-05-13 17:18:27 -07:00
James R
5f032789f3 Fix some goofs 2020-05-13 17:18:27 -07:00
James R
b48f5ecce6 Bruh 2020-05-13 17:18:27 -07:00
James R
bb2e2fddae Clean up a bunch of stuff and follow the Master Server API more closely 2020-05-13 17:18:27 -07:00
James R
b63e473d5b Windows certs do work, thanks Steel! 2020-05-13 17:18:27 -07:00
James R
8bd1a6ee90 Handle more errors 2020-05-13 17:18:27 -07:00
James R
c08d9a1329 Kill masterserver_token 2020-05-13 17:18:27 -07:00
James R
bb0aa4ce4e This will be the Master Server in 2020 2020-05-13 17:18:27 -07:00
James R
12788f6491 Use https because my web server redirects 2020-05-13 17:18:27 -07:00
James R
eec6a82882 strtok can return NULL 2020-05-13 17:18:27 -07:00
James R
f9260dedee This time I fucked up 2020-05-13 17:18:27 -07:00
James R
be4dda2fc4 Windows gaysed: the sequel 2020-05-13 17:18:27 -07:00
James R
975165c424 Windows is weird 2020-05-13 17:18:27 -07:00
James R
a5d65b2ede masterserver_debug to set CURLOPT_VERBOSE 2020-05-13 17:18:27 -07:00
James R
d2590e3a76 Don't show "All" room when hosting 2020-05-13 17:18:27 -07:00
James R
77642a7cda I don't even know my own website 2020-05-13 17:18:26 -07:00
James R
6f9b548840 lol 2020-05-13 17:18:26 -07:00
James R
65ff8e2f00 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
f6addb956e 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
93b6615e61 Store PolyObject waypoint return behavior in an enum 2020-05-13 16:21:47 +02:00
MascaraSnake
ea0176fada Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway 2020-05-13 14:40:07 +02:00
MascaraSnake
14608b0f49 Merge branch 'actnum-tweaks' into 'next'
Act number tweaks

See merge request STJr/SRB2!905
2020-05-13 04:25:53 -04:00
MascaraSnake
7ea005fdc1 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
bbded108ef 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
9ead3a8b47 Merge branch 'udmf-next' into executordelay 2020-05-13 10:01:41 +02:00
MascaraSnake
c2037391d2 Merge branch 'next' into udmf-next 2020-05-13 10:01:12 +02:00
MascaraSnake
2e9a6afa3e Merge branch 'udmf-next' into executordelay
# Conflicts:
#	src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
2e8bb50808 Fix accidental swap of first and last waypoint 2020-05-13 09:32:00 +02:00
MascaraSnake
7004d8ca75 Merge branch 'next' into waypoints 2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50 Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly 2020-05-12 23:50:30 +02:00
Louis-Antoine
3d08ffe514 Rename local variables 2020-05-12 19:58:16 +02:00
Monster Iestyn
86e2053dcd added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c) 2020-05-12 18:43:49 +01:00
Monster Iestyn
be0e7e63bf added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case) 2020-05-12 18:42:16 +01:00
Monster Iestyn
6878220a1b turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file) 2020-05-12 18:40:51 +01:00
Monster Iestyn
62a640e282 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
Louis-Antoine
70f4d12d38 Rename some file transfer functions 2020-05-12 19:06:40 +02:00
sphere
948582ce4e Restore SHORT(). 2020-05-12 17:20:29 +02:00
sphere
4d9d125a99 Fix some errors and add some comments. Also, actnum is not an INT32. 2020-05-12 17:20:28 +02:00
sphere
21130dfbb0 Support act numbers up to 99 and draw both digits individually. 2020-05-12 17:17:24 +02:00
MascaraSnake
999ebe2fd1 Rename variables for Fang waypoints, in preparation for new global waypoint data structure 2020-05-12 14:53:10 +02:00
Steel Titanium
a491f20bee Merge branch 'master' into next 2020-05-11 18:20:09 -04:00