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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
SteelT
|
0fab9d0602
|
Merge branch '2.2.4-prep' into 'next'
2.2.4 preparation
See merge request STJr/SRB2!935
|
2020-05-11 18:06:11 -04:00 |
|
James R
|
e80f6497d7
|
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
|
2020-05-11 15:01:32 -07:00 |
|
LJ Sonic
|
05ff660460
|
Merge branch 'fix-rollout-rock-crash' into 'next'
Fix crash with rollout rock
See merge request STJr/SRB2!936
|
2020-05-11 17:57:31 -04:00 |
|
Louis-Antoine
|
0c4f983eb5
|
Fix crash with rollout rock
|
2020-05-11 23:48:35 +02:00 |
|
James R
|
a645f3a44f
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
James R
|
c52c8e0282
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
d508d16cef
|
Merge branch 'master' into next
|
2020-05-11 20:08:02 +01:00 |
|
Zwip-Zwap Zapony
|
334ad93c56
|
Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
|
2020-05-11 19:57:20 +02:00 |
|
MascaraSnake
|
7ca886b07d
|
Merge branch 'showfps-fix' into 'master'
Don't show the FPS counter during startup.
See merge request STJr/SRB2!930
|
2020-05-11 13:31:26 -04:00 |
|
MascaraSnake
|
e288c9d4f2
|
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
|
2020-05-11 13:31:09 -04:00 |
|
MascaraSnake
|
7fa68d0e45
|
Merge branch 'delete-lua-again' into 'next'
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason
See merge request STJr/SRB2!932
|
2020-05-11 13:30:18 -04:00 |
|
toaster
|
e5bc0583e5
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
# Conflicts:
# src/m_menu.c
|
2020-05-11 15:00:31 +01:00 |
|
James R
|
7257fc730a
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
James R
|
6b4ee94e38
|
Use camera angle, not mobj angle, when comparing Angle Anchor
|
2020-05-10 19:40:28 -07:00 |
|
sphere
|
61dfee7e13
|
Don't show the FPS counter during startup.
|
2020-05-11 01:33:34 +02:00 |
|
SteelT
|
225095afa2
|
Merge branch '2.2.3-prep' into 'next'
2.2.3 preparation
See merge request STJr/SRB2!929
|
2020-05-10 17:13:04 -04:00 |
|
Steel Titanium
|
fabd76a5fe
|
Merge branch 'next' into 2.2.3-prep
|
2020-05-10 17:05:56 -04:00 |
|
Monster Iestyn
|
49864f646e
|
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
|
2020-05-10 20:10:11 +01:00 |
|
Monster Iestyn
|
197da95a23
|
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
|
2020-05-10 20:09:08 +01:00 |
|