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
MascaraSnake
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Monster Iestyn
0f4ada3d12
Merge branch 'gcc10-fixes' into 'master'
...
GCC 10 compiling fixes
See merge request STJr/SRB2!937
2020-05-12 14:47:49 -04:00
Louis-Antoine
bf660dd35a
Rename local variables
2020-05-12 19:58:16 +02:00
Monster Iestyn
8c88c3dbb4
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
064f4bcf34
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
dab212dc56
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
89cd756cd8
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
061fd4761a
Rename some file transfer functions
2020-05-12 19:06:40 +02:00
sphere
4eb5f09c6f
Restore SHORT().
2020-05-12 17:20:29 +02:00
sphere
0287c6956e
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-05-12 17:20:28 +02:00
sphere
69c11a8220
Support act numbers up to 99 and draw both digits individually.
2020-05-12 17:17:24 +02:00
MascaraSnake
435e6c9812
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
2020-05-12 14:53:10 +02:00
Steel Titanium
feced5ec3c
Merge branch 'master' into next
2020-05-11 18:20:09 -04:00
SteelT
78fe9af56a
Merge branch 'splitscreen-titlecards-fix' into 'master'
...
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00
SteelT
432cca7556
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
...
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
2020-05-11 18:17:59 -04:00
